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

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

Browse source
This commit is contained in:
Alejandro Alonso 2023-02-01 13:24:39 +01:00
commit e9c3b0567b
5 changed files with 40 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

8
frontend/src/app/main/ui/dashboard/team.cljs
View file

@ -637,7 +637,9 @@
{::mf/register modal/components
::mf/register-as :webhook}
[{:keys [webhook] :as props}]
(let [initial (mf/use-memo (fn [] (or webhook {:is-active false :mtype "application/json"})))
;; FIXME: this is a workaround because input fields do not support rendering hooks
(let [initial (mf/use-memo (fn [] (or (some-> webhook (update :uri str))
{:is-active false :mtype "application/json"})))
form (fm/use-form :spec ::webhook-form
:initial initial)
on-success
@ -735,8 +737,6 @@
]
[:div.explain (tr "dashboard.webhooks.active.explain")]]]
[:div.modal-footer
[:div.action-buttons
[:input.cancel-button
@ -827,7 +827,7 @@
{:success? (nil? error-code)
:text last-delivery-text}]]]
[:div.table-field.uri
[:div (:uri webhook)]]
[:div (dm/str (:uri webhook))]]
[:div.table-field.active
[:div (if (:is-active webhook)
(tr "labels.active")

10
frontend/src/app/main/ui/workspace/sidebar/assets.cljs
View file

@ -446,10 +446,7 @@
:editing renaming?)
:value (cph/merge-path-item (:path component) (:name component))
:tooltip (cph/merge-path-item (:path component) (:name component))
:display-value (if listing-thumbs?
(:name component)
(cph/compact-name (:path component)
(:name component)))
:display-value (:name component)
:editing? renaming?
:disable-dbl-click? true
:on-change do-rename
@ -831,10 +828,7 @@
:editing renaming?)
:value (cph/merge-path-item (:path object) (:name object))
:tooltip (cph/merge-path-item (:path object) (:name object))
:display-value (if listing-thumbs?
(:name object)
(cph/compact-name (:path object)
(:name object)))
:display-value (:name object)
:editing? renaming?
:disable-dbl-click? true
:on-change do-rename