From 85ae3ff6f875b09ce0966c48f093caca4feea564 Mon Sep 17 00:00:00 2001
From: "alonso.torres" <alonso.torres@kaleidos.net>
Date: Wed, 22 May 2024 17:23:02 +0200
Subject: [PATCH] :bug: Fix problem with hot reload

---
 frontend/src/app/plugins/page.cljs  |  5 +++--
 frontend/src/app/plugins/utils.cljs | 18 ++++++++++++------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/frontend/src/app/plugins/page.cljs b/frontend/src/app/plugins/page.cljs
index d23e105cf..68f26ed8e 100644
--- a/frontend/src/app/plugins/page.cljs
+++ b/frontend/src/app/plugins/page.cljs
@@ -28,8 +28,9 @@
   (findShapes
     [_]
     ;; Returns a lazy (iterable) of all available shapes
-    (let [page (locate-page $file $id)]
-      (apply array (sequence (map shape/shape-proxy) (keys (:objects page)))))))
+    (when (and (some? $file) (some? $id))
+      (let [page (locate-page $file $id)]
+        (apply array (sequence (map shape/shape-proxy) (keys (:objects page))))))))
 
 (crc/define-properties!
   PageProxy
diff --git a/frontend/src/app/plugins/utils.cljs b/frontend/src/app/plugins/utils.cljs
index 9d7e9aa55..e34fd8359 100644
--- a/frontend/src/app/plugins/utils.cljs
+++ b/frontend/src/app/plugins/utils.cljs
@@ -56,38 +56,44 @@
 (defn proxy->file
   [proxy]
   (let [id (obj/get proxy "$id")]
-    (locate-file id)))
+    (when (some? id)
+      (locate-file id))))
 
 (defn proxy->page
   [proxy]
   (let [file-id (obj/get proxy "$file")
         id (obj/get proxy "$id")]
-    (locate-page file-id id)))
+    (when (and (some? file-id) (some? id))
+      (locate-page file-id id))))
 
 (defn proxy->shape
   [proxy]
   (let [file-id (obj/get proxy "$file")
         page-id (obj/get proxy "$page")
         id (obj/get proxy "$id")]
-    (locate-shape file-id page-id id)))
+    (when (and (some? file-id) (some? page-id) (some? id))
+      (locate-shape file-id page-id id))))
 
 (defn proxy->library-color
   [proxy]
   (let [file-id (obj/get proxy "$file")
         id (obj/get proxy "$id")]
-    (locate-library-color file-id id)))
+    (when (and (some? file-id) (some? id))
+      (locate-library-color file-id id))))
 
 (defn proxy->library-typography
   [proxy]
   (let [file-id (obj/get proxy "$file")
         id (obj/get proxy "$id")]
-    (locate-library-color file-id id)))
+    (when (and (some? file-id) (some? id))
+      (locate-library-color file-id id))))
 
 (defn proxy->library-component
   [proxy]
   (let [file-id (obj/get proxy "$file")
         id (obj/get proxy "$id")]
-    (locate-library-color file-id id)))
+    (when (and (some? file-id) (some? id))
+      (locate-library-color file-id id))))
 
 (defn get-data
   ([self attr]