3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-05-13 03:26:38 +02:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Pablo Alba 2024-06-04 11:57:59 +02:00
commit 5b88589157
2 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

13
backend/src/app/rpc/commands/audit.clj
View file

@ -77,10 +77,19 @@
(when (seq events) (when (seq events)
(db/insert-many! pool :audit-log event-columns events)))) (db/insert-many! pool :audit-log event-columns events))))
(def valid-event-types
#{"action" "identify"})
(def schema:event (def schema:event
[:map {:title "Event"} [:map {:title "Event"}
[:name [:string {:max 250}]] [:name
[:type [:string {:max 250}]] [:and {:gen/elements ["update-file", "get-profile"]}
[:string {:max 250}]
[:re #"[\d\w-]{1,50}"]]]
[:type
[:and {:gen/elements valid-event-types}
[:string {:max 250}]
[::sm/one-of {:format "string"} valid-event-types]]]
[:props [:props
[:map-of :keyword :any]] [:map-of :keyword :any]]
[:context {:optional true} [:context {:optional true}

4
common/src/app/common/logic/libraries.cljc
View file

@ -265,6 +265,10 @@
; If the initial shape was component-root, first level subinstances are converted in top instances ; If the initial shape was component-root, first level subinstances are converted in top instances
(pcb/update-shapes [shape-id] #(assoc % :component-root true)) (pcb/update-shapes [shape-id] #(assoc % :component-root true))
:always
; First level subinstances of a detached component can't have swap-slot
(pcb/update-shapes [shape-id] ctk/remove-swap-slot)
:always :always
; Near shape-refs need to be advanced one level ; Near shape-refs need to be advanced one level
(generate-advance-nesting-level nil container libraries (:id shape))) (generate-advance-nesting-level nil container libraries (:id shape)))