From 9d05e2260cafa7a2dfa02a008af7d4e57877c4ae Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Sat, 11 Nov 2023 00:05:11 +0100 Subject: [PATCH] :bug: Fix incorrect local library indexing on components-v2 migration --- backend/src/app/features/components_v2.clj | 26 +++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/backend/src/app/features/components_v2.clj b/backend/src/app/features/components_v2.clj index ba1949550..cf22b7298 100644 --- a/backend/src/app/features/components_v2.clj +++ b/backend/src/app/features/components_v2.clj @@ -632,21 +632,21 @@ cfeat/*wrap-with-objects-map-fn* (if (contains? (:features file) "fdata/objectd-map") omap/wrap identity)] - (let [libs (sequence - (map (fn [{:keys [id] :as lib}] - (binding [pmap/*load-fn* (partial files/load-pointer conn id)] - (-> (db/get conn :file {:id id}) - (files/decode-row) - (files/process-pointers deref) ; ensure all pointers resolved - (pmg/migrate-file))))) - (files/get-file-libraries conn id)) - - libs (-> (d/index-by :id libs) - (assoc (:id file) file)) - - file (-> file + (let [file (-> file (update :data blob/decode) (update :data assoc :id id) + (pmg/migrate-file)) + + libs (->> (files/get-file-libraries conn id) + (into [file] (map (fn [{:keys [id]}] + (binding [pmap/*load-fn* (partial files/load-pointer conn id)] + (-> (db/get conn :file {:id id}) + (files/decode-row) + (files/process-pointers deref) ; ensure all pointers resolved + (pmg/migrate-file)))))) + (d/index-by :id)) + + file (-> file (update :data migrate-file-data libs) (update :features conj "components/v2"))]