From ffe2abc9927291e3efa70890b235b23c4727a115 Mon Sep 17 00:00:00 2001 From: Florian Schroedl Date: Wed, 27 Nov 2024 10:22:23 +0100 Subject: [PATCH] Renaming --- common/src/app/common/files/changes_builder.cljc | 6 +++--- common/src/app/common/types/tokens_lib.cljc | 16 ++++++++-------- frontend/src/app/main/data/tokens.cljs | 4 ++-- .../ui/workspace/tokens/sets_context_menu.cljs | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/common/src/app/common/files/changes_builder.cljc b/common/src/app/common/files/changes_builder.cljc index 6e6ead182..d68aec93c 100644 --- a/common/src/app/common/files/changes_builder.cljc +++ b/common/src/app/common/files/changes_builder.cljc @@ -820,13 +820,13 @@ (apply-changes-local))) (defn delete-token-set-path - [changes token-set-path] + [changes prefixed-full-set-path] (assert-library! changes) (let [library-data (::library-data (meta changes)) prev-token-sets (some-> (get library-data :tokens-lib) - (ctob/get-path-sets token-set-path))] + (ctob/get-sets-at-prefix-path prefixed-full-set-path))] (-> changes - (update :redo-changes conj {:type :del-token-set-path :path token-set-path}) + (update :redo-changes conj {:type :del-token-set-path :path prefixed-full-set-path}) (update :undo-changes conj {:type :add-token-sets :token-sets prev-token-sets}) (apply-changes-local)))) diff --git a/common/src/app/common/types/tokens_lib.cljc b/common/src/app/common/types/tokens_lib.cljc index 788c3d4ae..e32677429 100644 --- a/common/src/app/common/types/tokens_lib.cljc +++ b/common/src/app/common/types/tokens_lib.cljc @@ -387,7 +387,7 @@ When `before-set-name` is nil, move set to bottom") (get-set-tree [_] "get a nested tree of all sets in the library") (get-in-set-tree [_ path] "get `path` in nested tree of all sets in the library") (get-sets [_] "get an ordered sequence of all sets in the library") - (get-path-sets [_ path] "get an ordered sequence of sets at `path` in the library") + (get-sets-at-prefix-path [_ path] "get an ordered sequence of sets at `path` in the library") (get-ordered-set-names [_] "get an ordered sequence of all sets names in the library") (get-set [_ set-name] "get one set looking for name") (get-neighbor-set-name [_ set-name index-offset] "get neighboring set name offset by `index-offset`")) @@ -644,18 +644,18 @@ When `before-set-name` is nil, move set to bottom") this token-sets)) (update-set [this set-name f] - (let [path (set-full-name->prefixed-full-path set-name) - set (get-in sets path)] + (let [prefixed-full-path (set-full-name->prefixed-full-path set-name) + set (get-in sets prefixed-full-path)] (if set (let [set' (-> (make-token-set (f set)) (assoc :modified-at (dt/now))) - path' (get-token-set-prefixed-path set') + prefixed-full-path' (get-token-set-prefixed-path set') name-changed? (not= (:name set) (:name set'))] (check-token-set! set') (if name-changed? (TokensLib. (-> sets - (d/oassoc-in-before path path' set') - (d/dissoc-in path)) + (d/oassoc-in-before prefixed-full-path prefixed-full-path' set') + (d/dissoc-in prefixed-full-path)) (walk/postwalk (fn [form] (if (instance? TokenTheme form) @@ -663,7 +663,7 @@ When `before-set-name` is nil, move set to bottom") form)) themes) active-themes) - (TokensLib. (d/oassoc-in sets path set') + (TokensLib. (d/oassoc-in sets prefixed-full-path set') themes active-themes))) this))) @@ -710,7 +710,7 @@ When `before-set-name` is nil, move set to bottom") (->> (tree-seq d/ordered-map? vals sets) (filter (partial instance? TokenSet)))) - (get-path-sets [_ path] + (get-sets-at-prefix-path [_ path] (some->> (get-in sets (split-token-set-path path)) (tree-seq d/ordered-map? vals) (filter (partial instance? TokenSet)))) diff --git a/frontend/src/app/main/data/tokens.cljs b/frontend/src/app/main/data/tokens.cljs index aad80703b..ac35ab745 100644 --- a/frontend/src/app/main/data/tokens.cljs +++ b/frontend/src/app/main/data/tokens.cljs @@ -219,14 +219,14 @@ update-token-set-change (wtu/update-workspace-tokens)))))) -(defn delete-token-set-path [token-set-path] +(defn delete-token-set-path [prefixed-full-set-path] (ptk/reify ::delete-token-set-path ptk/WatchEvent (watch [it state _] (let [data (get state :workspace-data) changes (-> (pcb/empty-changes it) (pcb/with-library-data data) - (pcb/delete-token-set-path token-set-path))] + (pcb/delete-token-set-path prefixed-full-set-path))] (rx/of (dch/commit-changes changes) (wtu/update-workspace-tokens)))))) diff --git a/frontend/src/app/main/ui/workspace/tokens/sets_context_menu.cljs b/frontend/src/app/main/ui/workspace/tokens/sets_context_menu.cljs index 4fb37428a..e0e8e1159 100644 --- a/frontend/src/app/main/ui/workspace/tokens/sets_context_menu.cljs +++ b/frontend/src/app/main/ui/workspace/tokens/sets_context_menu.cljs @@ -38,7 +38,7 @@ [{:keys [tree-path]}] (let [{:keys [on-edit]} (sets-context/use-context) edit-name (mf/use-fn #(on-edit tree-path)) - delete-set (mf/use-fn #(st/emit! (wdt/delete-token-set-path tree-path)))] + delete-set (mf/use-fn #(st/emit! (wdt/delete-token-set-prefix-full-path tree-path)))] [:ul {:class (stl/css :context-list)} [:& menu-entry {:title (tr "labels.rename") :on-click edit-name}] [:& menu-entry {:title (tr "labels.delete") :on-click delete-set}]]))