From 7e302cd21c6100feb3776f81dc3382ef4cb121aa Mon Sep 17 00:00:00 2001
From: Andrey Antukh <niwi@niwi.nz>
Date: Wed, 15 Nov 2023 16:56:51 +0100
Subject: [PATCH] :sparkles: Add better validation for recent-color change

---
 common/src/app/common/files/changes.cljc            | 3 ++-
 common/src/app/common/types/color.cljc              | 8 +++-----
 frontend/src/app/main/data/workspace/libraries.cljs | 4 ++--
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/common/src/app/common/files/changes.cljc b/common/src/app/common/files/changes.cljc
index cc2e2ee80..600de124b 100644
--- a/common/src/app/common/files/changes.cljc
+++ b/common/src/app/common/files/changes.cljc
@@ -13,6 +13,7 @@
    [app.common.geom.shapes :as gsh]
    [app.common.schema :as sm]
    [app.common.schema.desc-native :as smd]
+   [app.common.types.color :as ctc]
    [app.common.types.colors-list :as ctcl]
    [app.common.types.component :as ctk]
    [app.common.types.components-list :as ctkl]
@@ -166,7 +167,7 @@
     [:add-recent-color
      [:map {:title "AddRecentColorChange"}
       [:type [:= :add-recent-color]]
-      [:color :any]]]
+      [:color ::ctc/recent-color]]]
 
     [:add-media
      [:map {:title "AddMediaChange"}
diff --git a/common/src/app/common/types/color.cljc b/common/src/app/common/types/color.cljc
index 4c1b988f5..309d51b77 100644
--- a/common/src/app/common/types/color.cljc
+++ b/common/src/app/common/types/color.cljc
@@ -70,7 +70,7 @@
       [:offset ::sm/safe-number]]]]])
 
 (sm/def! ::color
-  [:map
+  [:map {:title "Color"}
    [:id {:optional true} ::sm/uuid]
    [:name {:optional true} :string]
    [:path {:optional true} [:maybe :string]]
@@ -83,8 +83,6 @@
    [:gradient {:optional true} [:maybe ::gradient]]
    [:image {:optional true} [:maybe ::image-color]]])
 
-
-;; FIXME: incomplete schema
 (sm/def! ::recent-color
   [:and
    [:map {:title "RecentColor"}
@@ -94,10 +92,10 @@
     [:image {:optional true} [:maybe ::image-color]]]
    [::sm/contains-any {:strict true} [:color :gradient :image]]])
 
-(def color?
+(def valid-color?
   (sm/pred-fn ::color))
 
-(def recent-color?
+(def valid-recent-color?
   (sm/pred-fn ::recent-color))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/frontend/src/app/main/data/workspace/libraries.cljs b/frontend/src/app/main/data/workspace/libraries.cljs
index 70815456a..276f19900 100644
--- a/frontend/src/app/main/data/workspace/libraries.cljs
+++ b/frontend/src/app/main/data/workspace/libraries.cljs
@@ -113,7 +113,7 @@
 
 (defn add-recent-color
   [color]
-  (dm/assert! (ctc/recent-color? color))
+  (dm/assert! (ctc/valid-recent-color? color))
   (ptk/reify ::add-recent-color
     ptk/WatchEvent
     (watch [it _ _]
@@ -143,7 +143,7 @@
 
 (defn update-color
   [color file-id]
-  (dm/assert! (ctc/color? color))
+  (dm/assert! (ctc/valid-color? color))
   (dm/assert! (uuid? file-id))
 
   (ptk/reify ::update-color