Преглед на файлове

fix(rtc): fix format of :server-schema-version in the API get-graph-skeleton response

rcmerci преди 8 месеца
родител
ревизия
dd97879e81
променени са 2 файла, в които са добавени 4 реда и са изтрити 11 реда
  1. 3 9
      deps/db/src/logseq/db/frontend/schema.cljs
  2. 1 2
      src/main/frontend/worker/rtc/malli_schema.cljs

+ 3 - 9
deps/db/src/logseq/db/frontend/schema.cljs

@@ -28,15 +28,9 @@
 
 (defn compare-schema-version
   [x y]
-  (if (schema-version? x)
-    (cond
-      (number? y) (compare (:major x) y)
-      (sequential? y) (compare [(:major x) (:minor x)] [(first y) (second y)])
-      (schema-version? y)
-      (apply compare (map (juxt :major :minor) [x y]))
-      :else
-      (throw (js/Error. (str "Cannot compare " x " to " y))))
-    (compare-schema-version (parse-schema-version x) y)))
+  (apply compare
+         (map (juxt :major :minor)
+              [(parse-schema-version x) (parse-schema-version y)])))
 
 (def version (parse-schema-version "64.1"))
 

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

@@ -94,7 +94,6 @@
    [:t {:optional true} :int]
    [:t-before {:optional true} :int]
    [:s3-presign-url {:optional true} :string]
-   [:server-schema-version {:optional true} :int]
    [:server-builtin-db-idents {:optional true} [:set :keyword]]
    [:server-only-db-ident-blocks {:optional true} [:maybe :string] ;;transit
     ]
@@ -211,7 +210,7 @@
      ["grant-access" [:map]]
      ["get-graph-skeleton"
       [:map
-       [:server-schema-version :int]
+       [:server-schema-version :string]
        [:server-builtin-db-idents [:set :keyword]]]]
      ["presign-put-temp-s3-obj" [:map]]
      ["get-users-info"