From ebd172ab053b9aeb30716ab20b70c17aec5f13fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Moya?= Date: Sun, 11 Jun 2023 22:29:34 +0200 Subject: [PATCH] :bug: Fix detection of libraries needing to update --- frontend/src/app/main/data/workspace.cljs | 5 +++-- frontend/src/app/main/ui/workspace/libraries.cljs | 9 ++++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/frontend/src/app/main/data/workspace.cljs b/frontend/src/app/main/data/workspace.cljs index 998f2d228..ab7a52d35 100644 --- a/frontend/src/app/main/data/workspace.cljs +++ b/frontend/src/app/main/data/workspace.cljs @@ -211,8 +211,9 @@ (->> (rp/cmd! :get-file-libraries {:file-id id}) (rx/mapcat identity) (rx/merge-map - (fn [{:keys [id]}] - (rp/cmd! :get-file {:id id :features features}))) + (fn [{:keys [id synced-at]}] + (->> (rp/cmd! :get-file {:id id :features features}) + (rx/map #(assoc % :synced-at synced-at))))) (rx/merge-map (fn [{:keys [id data] :as file}] (->> (resolve-file-data id data) diff --git a/frontend/src/app/main/ui/workspace/libraries.cljs b/frontend/src/app/main/ui/workspace/libraries.cljs index 063176d54..e1b666044 100644 --- a/frontend/src/app/main/ui/workspace/libraries.cljs +++ b/frontend/src/app/main/ui/workspace/libraries.cljs @@ -234,9 +234,10 @@ (mf/defc updates-tab {::mf/wrap-props false} - [{:keys [file-id libraries]}] - (let [libraries (mf/with-memo [libraries] - (filter #(> (:modified-at %) (:synced-at %)) (vals libraries))) + [{:keys [file-id file-data libraries]}] + (let [libraries (mf/with-memo [file-data libraries] + (filter #(seq (dwl/assets-need-sync % file-data)) + (vals libraries))) update (mf/use-fn (mf/deps file-id) @@ -267,6 +268,7 @@ ::mf/register-as :libraries-dialog} [] (let [project (mf/deref refs/workspace-project) + file-data (mf/deref refs/workspace-data) file (mf/deref ref:workspace-file) team-id (:team-id project) @@ -319,5 +321,6 @@ :shared-libraries shared-libraries}] :updates [:& updates-tab {:file-id file-id + :file-data file-data :libraries libraries}])]]]]))