浏览代码

fix(rtc): delete-assets api, schema-version parameter is missing

rcmerci 8 月之前
父节点
当前提交
196ffdfe53

+ 4 - 3
src/main/frontend/worker/rtc/asset.cljs

@@ -168,7 +168,7 @@
        (m/reduce (constantly nil))))
 
 (defn- new-task--push-local-asset-updates
-  [repo get-ws-create-task conn graph-uuid add-log-fn]
+  [repo get-ws-create-task conn graph-uuid schema-version add-log-fn]
   (m/sp
     (when-let [asset-ops (not-empty (client-op/get-all-asset-ops repo))]
       (let [upload-asset-uuids (keep
@@ -209,6 +209,7 @@
           (m/? (ws-util/send&recv get-ws-create-task
                                   {:action "delete-assets"
                                    :graph-uuid graph-uuid
+                                   :schema-version (str schema-version)
                                    :asset-uuids remove-asset-uuids}))
           (doseq [asset-uuid remove-asset-uuids]
             (client-op/remove-asset-op repo asset-uuid)))
@@ -275,7 +276,7 @@
               repo get-ws-create-task conn graph-uuid add-log-fn asset-update-ops))))))
 
 (defn create-assets-sync-loop
-  [repo get-ws-create-task graph-uuid conn *auto-push?]
+  [repo get-ws-create-task graph-uuid schema-version conn *auto-push?]
   (let [started-dfv         (m/dfv)
         add-log-fn (fn [type message]
                      (assert (map? message) message)
@@ -298,7 +299,7 @@
                        repo get-ws-create-task conn graph-uuid add-log-fn asset-update-ops)))
                :local-update-check
                (m/? (new-task--push-local-asset-updates
-                     repo get-ws-create-task conn graph-uuid add-log-fn))))
+                     repo get-ws-create-task conn graph-uuid schema-version add-log-fn))))
            m/ap
            (m/reduce {} nil)
            m/?)

+ 1 - 1
src/main/frontend/worker/rtc/core.cljs

@@ -198,7 +198,7 @@
                                     get-ws-create-task graph-uuid major-schema-version
                                     repo conn *last-calibrate-t *online-users add-log-fn)
         {:keys [assets-sync-loop-task]}
-        (r.asset/create-assets-sync-loop repo get-ws-create-task graph-uuid conn *auto-push?)
+        (r.asset/create-assets-sync-loop repo get-ws-create-task graph-uuid major-schema-version conn *auto-push?)
         mixed-flow                 (create-mixed-flow repo get-ws-create-task *auto-push? *online-users)]
     (assert (some? *current-ws))
     {:rtc-state-flow       (create-rtc-state-flow (create-ws-state-flow *current-ws))

+ 1 - 0
src/main/frontend/worker/rtc/malli_schema.cljs

@@ -322,6 +322,7 @@
       ["delete-assets"
        [:map
         [:graph-uuid :uuid]
+        [:schema-version db-schema/major-schema-version-string-schema]
         [:asset-uuids [:sequential :uuid]]]]
       ["get-user-devices"
        [:map]]