From ebb5738c7b82bb70c2ed1a374d9dc6ab1a4670f7 Mon Sep 17 00:00:00 2001 From: sxxtony <166789813+sxxtony@users.noreply.github.com> Date: Wed, 10 Jun 2026 11:52:54 +0300 Subject: [PATCH] :recycle: Migrate dashboard assets to modern syntax (#9404) Co-authored-by: Andrey Antukh --- frontend/src/app/main/ui/dashboard/fonts.cljs | 22 +++++++++---------- .../src/app/main/ui/dashboard/import.cljs | 6 ++--- .../app/main/ui/dashboard/placeholder.cljs | 6 ++--- .../app/main/ui/dashboard/project_menu.cljs | 7 +++--- .../src/app/main/ui/dashboard/templates.cljs | 10 ++++----- 5 files changed, 22 insertions(+), 29 deletions(-) diff --git a/frontend/src/app/main/ui/dashboard/fonts.cljs b/frontend/src/app/main/ui/dashboard/fonts.cljs index 8892687490..6c248beb04 100644 --- a/frontend/src/app/main/ui/dashboard/fonts.cljs +++ b/frontend/src/app/main/ui/dashboard/fonts.cljs @@ -273,9 +273,8 @@ :on-click on-delete} deprecated-icon/close]]]))]])) -(mf/defc installed-font-context-menu - {::mf/props :obj - ::mf/private true} +(mf/defc installed-font-context-menu* + {::mf/private true} [{:keys [is-open on-close on-edit on-download on-delete]}] (let [options (mf/with-memo [on-edit on-download on-delete] [{:name (tr "labels.edit") @@ -296,10 +295,9 @@ :left -115 :options options}])) -(mf/defc installed-font - {::mf/props :obj - ::mf/private true - ::mf/memo true} +(mf/defc installed-font* + {::mf/private true + ::mf/wrap [mf/memo]} [{:keys [font-id variants can-edit]}] (let [font (first variants) @@ -445,7 +443,7 @@ :on-click on-menu-open} deprecated-icon/menu] - [:& installed-font-context-menu + [:> installed-font-context-menu* {:on-close on-menu-close :is-open menu-open? :on-delete on-delete-font @@ -480,10 +478,10 @@ (for [[font-id variants] (->> (vals fonts) (filter matches?) (group-by :font-id))] - [:& installed-font {:key (dm/str font-id "-installed") - :font-id font-id - :can-edit can-edit - :variants variants}])] + [:> installed-font* {:key (dm/str font-id "-installed") + :font-id font-id + :can-edit can-edit + :variants variants}])] (nil? fonts) [:div {:class (stl/css :fonts-placeholder)} diff --git a/frontend/src/app/main/ui/dashboard/import.cljs b/frontend/src/app/main/ui/dashboard/import.cljs index 0a4698eab3..a279c62420 100644 --- a/frontend/src/app/main/ui/dashboard/import.cljs +++ b/frontend/src/app/main/ui/dashboard/import.cljs @@ -50,10 +50,8 @@ :entries entries :on-finish-import on-finish-import}))))))) -(mf/defc import-form - {::mf/forward-ref true - ::mf/props :obj} - +(mf/defc import-form* + {::mf/forward-ref true} [{:keys [project-id on-finish-import]} external-ref] (let [on-file-selected (use-import-file project-id on-finish-import)] [:form.import-file {:aria-hidden "true"} diff --git a/frontend/src/app/main/ui/dashboard/placeholder.cljs b/frontend/src/app/main/ui/dashboard/placeholder.cljs index ae0cd7b97d..1c47e099b9 100644 --- a/frontend/src/app/main/ui/dashboard/placeholder.cljs +++ b/frontend/src/app/main/ui/dashboard/placeholder.cljs @@ -59,9 +59,9 @@ [:div {:class (stl/css :empty-project-card-subtitle)} (tr "dashboard.empty-project.explore")]] - [:& udi/import-form {:ref file-input - :project-id project-id - :on-finish-import on-finish-import}]])) + [:> udi/import-form* {:ref file-input + :project-id project-id + :on-finish-import on-finish-import}]])) (defn- make-has-other-files-or-projects-ref "Return a ref that resolves to true or false if there are at least some diff --git a/frontend/src/app/main/ui/dashboard/project_menu.cljs b/frontend/src/app/main/ui/dashboard/project_menu.cljs index 4eddf3de91..00db6a7918 100644 --- a/frontend/src/app/main/ui/dashboard/project_menu.cljs +++ b/frontend/src/app/main/ui/dashboard/project_menu.cljs @@ -137,8 +137,7 @@ :top top :left left :options options}] - [:& udi/import-form {:ref file-input - :project-id (:id project) - :on-finish-import on-finish-import}]])) - + [:> udi/import-form* {:ref file-input + :project-id (:id project) + :on-finish-import on-finish-import}]])) diff --git a/frontend/src/app/main/ui/dashboard/templates.cljs b/frontend/src/app/main/ui/dashboard/templates.cljs index 32fab39dfc..b5a12d2dcf 100644 --- a/frontend/src/app/main/ui/dashboard/templates.cljs +++ b/frontend/src/app/main/ui/dashboard/templates.cljs @@ -91,8 +91,7 @@ [:span {:class (stl/css :title-icon)} arrow-icon]])]])) -(mf/defc card-item - {::mf/wrap-props false} +(mf/defc card-item* [{:keys [item index is-visible collapsed on-import]}] (let [id (dm/str "card-container-" index) href (u/join cf/public-uri (dm/str "images/thumbnails/template-" (:id item) ".jpg")) @@ -134,8 +133,7 @@ (:name item))] download-icon]]])) -(mf/defc card-item-link - {::mf/wrap-props false} +(mf/defc card-item-link* [{:keys [total is-visible collapsed section]}] (let [id (dm/str "card-container-" total) @@ -270,7 +268,7 @@ :ref content-ref} (for [index (range (count templates))] - [:& card-item + [:> card-item* {:on-import on-import-template :item (nth templates index) :index index @@ -278,7 +276,7 @@ :is-visible true :collapsed collapsed}]) - [:& card-item-link + [:> card-item-link* {:is-visible true :collapsed collapsed :section section