github/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2026-05-25 18:03:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
Andrey Antukh 2026-03-09 21:28:11 +01:00
commit e5f321c8f1
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/src/app/rpc/management/nitrate.clj
View File

@ -120,10 +120,10 @@
(let [features (-> (cfeat/get-enabled-features cf/flags) (let [features (-> (cfeat/get-enabled-features cf/flags)
(set/difference cfeat/frontend-only-features) (set/difference cfeat/frontend-only-features)
(set/difference cfeat/no-team-inheritable-features)) (set/difference cfeat/no-team-inheritable-features))
;; TODO Choose a better name and manage a default-in-org setting
params {:profile-id profile-id params {:profile-id profile-id
:name "Default"
:features features :features features
:name "NitrateDefault"} :is-default true}
team (db/tx-run! cfg teams/create-team params)] team (db/tx-run! cfg teams/create-team params)]
(select-keys team [:id]))) (select-keys team [:id])))

10
frontend/src/app/main/ui.cljs
View File

@ -10,6 +10,7 @@
[app.common.uuid :as uuid] [app.common.uuid :as uuid]
[app.config :as cf] [app.config :as cf]
[app.main.data.common :as dcm] [app.main.data.common :as dcm]
[app.main.data.modal :as modal]
[app.main.data.team :as dtm] [app.main.data.team :as dtm]
[app.main.errors :as errors] [app.main.errors :as errors]
[app.main.refs :as refs] [app.main.refs :as refs]
@ -153,6 +154,8 @@
props (get profile :props) props (get profile :props)
section (get data :name) section (get data :name)
team (mf/deref refs/team) team (mf/deref refs/team)
params-release-notes
(-> route :params :query :release-notes)
show-question-modal? show-question-modal?
@ -179,6 +182,13 @@
(not= (:release-notes-viewed props) (:main cf/version)) (not= (:release-notes-viewed props) (:main cf/version))
(not= "0.0" (:main cf/version)))] (not= "0.0" (:main cf/version)))]
(mf/with-effect [section params-release-notes]
(when (= params-release-notes "show")
(let [query-params (-> route :params :query)
updated-params (dissoc query-params :release-notes)]
(st/emit! (modal/show {:type :release-notes :version (:main cf/version)}))
(st/emit! (rt/nav section updated-params {::rt/replace true})))))
[:& (mf/provider ctx/current-route) {:value route} [:& (mf/provider ctx/current-route) {:value route}
(case section (case section
(:auth-login (:auth-login