From 411fe5448bb1d932722cbb58f1ef241ce5527ce5 Mon Sep 17 00:00:00 2001 From: "alonso.torres" Date: Thu, 6 Jun 2024 09:44:23 +0200 Subject: [PATCH] :bug: Fix rename layers for plugins --- .../ui/workspace/viewport/grid_layout_editor.cljs | 4 ++-- frontend/src/app/plugins/shape.cljs | 13 ++++++++++--- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/frontend/src/app/main/ui/workspace/viewport/grid_layout_editor.cljs b/frontend/src/app/main/ui/workspace/viewport/grid_layout_editor.cljs index 572c1068d..49570f1c9 100644 --- a/frontend/src/app/main/ui/workspace/viewport/grid_layout_editor.cljs +++ b/frontend/src/app/main/ui/workspace/viewport/grid_layout_editor.cljs @@ -967,13 +967,13 @@ (mf/use-fn (mf/deps (:id shape)) (fn [] - (st/emit! (st/emit! (dwsl/add-layout-track [(:id shape)] :column ctl/default-track-value))))) + (st/emit! (dwsl/add-layout-track [(:id shape)] :column ctl/default-track-value)))) handle-add-row (mf/use-fn (mf/deps (:id shape)) (fn [] - (st/emit! (st/emit! (dwsl/add-layout-track [(:id shape)] :row ctl/default-track-value))))) + (st/emit! (dwsl/add-layout-track [(:id shape)] :row ctl/default-track-value)))) target-tracks* (mf/use-ref nil) drop-track-type* (mf/use-state nil) diff --git a/frontend/src/app/plugins/shape.cljs b/frontend/src/app/plugins/shape.cljs index c5db5d548..a22bbab69 100644 --- a/frontend/src/app/plugins/shape.cljs +++ b/frontend/src/app/plugins/shape.cljs @@ -32,7 +32,8 @@ [app.plugins.utils :as u] [app.util.object :as obj] [app.util.path.format :as upf] - [app.util.text-editor :as ted])) + [app.util.text-editor :as ted] + [cuerdas.core :as str])) (declare shape-proxy) @@ -176,8 +177,14 @@ {:name "name" :get #(-> % u/proxy->shape :name) :set (fn [self value] - (let [id (obj/get self "$id")] - (st/emit! (dwsh/update-shapes [id] #(assoc % :name value)))))} + (let [id (obj/get self "$id") + value (when (string? value) (-> value str/trim cfh/clean-path)) + valid? (and (some? value) + (not (str/ends-with? value "/")) + (not (str/blank? value)))] + (if valid? + (st/emit! (dwsh/update-shapes [id] #(assoc % :name value))) + (u/display-not-valid :shape-name value))))} {:name "blocked" :get #(-> % u/proxy->shape :blocked boolean)