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

🐛 Fix features related issues with render entrypoint (exporter)

Browse source
This commit is contained in:
Andrey Antukh 2023-11-13 18:09:25 +01:00
parent 0a656e9e62
commit 26d3d7f1a8
8 changed files with 264 additions and 227 deletions
Download patch file Download diff file Expand all files Collapse all files

22
backend/src/app/rpc/commands/files.clj
View file

@ -443,10 +443,17 @@
"Given the page data and the object-id returns the page data with all
other not needed objects removed from the `:objects` data
structure."
[{:keys [objects] :as page} object-id]
(let [objects (->> (cph/get-children-with-self objects object-id)
(filter some?))]
(assoc page :objects (d/index-by :id objects))))
[page id-or-ids]
(update page :objects (fn [objects]
(reduce (fn [result object-id]
(->> (cph/get-children-with-self objects object-id)
(filter some?)
(d/index-by :id)
(merge result)))
{}
(if (uuid? id-or-ids)
[id-or-ids]
id-or-ids)))))
(defn- prune-thumbnails
"Given the page data, removes the `:thumbnail` prop from all
@ -480,7 +487,7 @@
page)))]
(cond-> (prune-thumbnails page)
(uuid? object-id)
(some? object-id)
(prune-objects object-id))))
(def schema:get-page
@ -488,7 +495,7 @@
[:file-id ::sm/uuid]
[:page-id {:optional true} ::sm/uuid]
[:share-id {:optional true} ::sm/uuid]
[:object-id {:optional true} ::sm/uuid]
[:object-id {:optional true} [:or ::sm/uuid ::sm/coll-of-uuid]]
[:features {:optional true} ::cfeat/features]])
(sv/defmethod ::get-page
@ -500,7 +507,8 @@
If you specify the object-id, the page-id parameter becomes
mandatory.
Mainly used for rendering purposes."
Mainly used for rendering purposes on the exporter. It does not
accepts client features."
{::doc/added "1.17"
::sm/params schema:get-page}
[cfg {:keys [::rpc/profile-id file-id share-id] :as params}]

14
backend/src/app/rpc/commands/teams.clj
View file

@ -138,14 +138,20 @@
(declare get-team)
(def ^:private schema:get-team
[:map {:title "get-team"}
[:id ::sm/uuid]])
[:and
[:map {:title "get-team"}
[:id {:optional true} ::sm/uuid]
[:file-id {:optional true} ::sm/uuid]]
[:fn (fn [params]
(or (contains? params :id)
(contains? params :file-id)))]])
(sv/defmethod ::get-team
{::doc/added "1.17"
::sm/params schema:get-team}
[cfg {:keys [::rpc/profile-id id]}]
(db/tx-run! cfg #(get-team % :profile-id profile-id :team-id id)))
[cfg {:keys [::rpc/profile-id id file-id]}]
(db/tx-run! cfg #(get-team % :profile-id profile-id :team-id id :file-id file-id)))
(defn get-team
[conn & {:keys [profile-id team-id project-id file-id] :as params}]