3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-05-29 20:36:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'staging' into develop

Browse source
This commit is contained in:
Andrey Antukh 2025-04-07 14:45:08 +02:00
commit 0f1b2003be
4 changed files with 13 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

3
frontend/src/app/main/data/dashboard.cljs
View file

@ -56,8 +56,7 @@
(rx/filter (fn [{:keys [topic] :as msg}]
(or (= topic uuid/zero)
(= topic profile-id))))
(rx/map process-message)
(rx/ignore)))
(rx/map process-message)))
(rx/take-until stopper))))))

2
frontend/src/app/main/features.cljs
View file

@ -31,7 +31,7 @@
(let [team (dm/get-in state [:teams team-id])]
(-> global-enabled-features
(set/union (get state :features-runtime #{}))
(set/difference cfeat/no-migration-features)
(set/intersection cfeat/no-migration-features)
(set/union (get team :features)))))
(defn active-feature?

23
frontend/src/app/main/ui/dashboard/placeholder.cljs
View file

@ -7,8 +7,8 @@
(ns app.main.ui.dashboard.placeholder
(:require-macros [app.main.style :as stl])
(:require
[app.config :as cf]
[app.main.data.event :as ev]
[app.main.refs :as refs]
[app.main.store :as st]
[app.main.ui.dashboard.import :as udi]
[app.main.ui.ds.product.empty-placeholder :refer [empty-placeholder*]]
@ -55,9 +55,10 @@
(mf/deps create-fn)
(fn [_]
(create-fn "dashboard:empty-folder-placeholder")))
show-text (mf/use-state nil)
show-text (mf/use-state nil)
on-mouse-enter (mf/use-fn #(reset! show-text true))
on-mouse-leave (mf/use-fn #(reset! show-text nil))]
on-mouse-leave (mf/use-fn #(reset! show-text nil))
files (mf/deref refs/files)]
(cond
(true? dragging?)
[:ul
@ -79,18 +80,14 @@
:tag-name "span"}])]
:else
(if (cf/external-feature-flag "add-file-02" "test")
(if (= (count files) 0)
[:> empty-placeholder-projects* {:on-create on-click :on-finish-import on-finish-import :project-id project-id}]
[:div {:class (stl/css :grid-empty-placeholder)}
(if (cf/external-feature-flag "add-file-01" "test")
[:button {:class (stl/css :create-new)
:on-click on-click
:on-mouse-enter on-mouse-enter
:on-mouse-leave on-mouse-leave}
(if @show-text (tr "dashboard.empty-project.create") i/add)]
[:button {:class (stl/css :create-new)
:on-click on-click}
i/add])]))))
[:button {:class (stl/css :create-new)
:on-click on-click
:on-mouse-enter on-mouse-enter
:on-mouse-leave on-mouse-leave}
(if @show-text (tr "dashboard.empty-project.create") i/add)]]))))
(mf/defc loading-placeholder
[]