refactor: prefer conn than repo for outliner core and rtc update

Author: tiensonqin

deps/outliner/src/logseq/outliner/core.cljs

@@ -169,7 +169,7 @@
           (reset! *result {:error (str "Unexpected Import EDN error: " (pr-str (ex-message e)))}))))))
 
 (defn ^:large-vars/cleanup-todo apply-ops!
-  [repo conn ops date-formatter opts]
+  [conn ops opts]
   (assert (ops-validator ops) ops)
   (let [opts' (assoc opts
                      :transact-opts {:conn conn}
@@ -181,37 +181,37 @@
        (case op
          ;; blocks
          :save-block
-         (apply outliner-core/save-block! repo conn date-formatter args)
+         (apply outliner-core/save-block! conn args)
 
          :insert-blocks
          (let [[blocks target-block-id opts] args]
            (when-let [target-block (d/entity @conn target-block-id)]
-             (let [result (outliner-core/insert-blocks! repo conn blocks target-block opts)]
+             (let [result (outliner-core/insert-blocks! conn blocks target-block opts)]
                (reset! *result result))))
 
          :delete-blocks
          (let [[block-ids opts] args
                blocks (keep #(d/entity @conn %) block-ids)]
-           (outliner-core/delete-blocks! repo conn date-formatter blocks (merge opts opts')))
+           (outliner-core/delete-blocks! conn blocks (merge opts opts')))
 
          :move-blocks
          (let [[block-ids target-block-id opts] args
                blocks (keep #(d/entity @conn %) block-ids)
                target-block (d/entity @conn target-block-id)]
            (when (and target-block (seq blocks))
-             (outliner-core/move-blocks! repo conn blocks target-block opts)))
+             (outliner-core/move-blocks! conn blocks target-block opts)))
 
          :move-blocks-up-down
          (let [[block-ids up?] args
                blocks (keep #(d/entity @conn %) block-ids)]
            (when (seq blocks)
-             (outliner-core/move-blocks-up-down! repo conn blocks up?)))
+             (outliner-core/move-blocks-up-down! conn blocks up?)))
 
          :indent-outdent-blocks
          (let [[block-ids indent? opts] args
                blocks (keep #(d/entity @conn %) block-ids)]
            (when (seq blocks)
-             (outliner-core/indent-outdent-blocks! repo conn blocks indent? opts)))
+             (outliner-core/indent-outdent-blocks! conn blocks indent? opts)))
 
          ;; properties
          :upsert-property
@@ -260,6 +260,6 @@
          (apply ldb/transact! conn args)
 
          (when-let [handler (get @*op-handlers op)]
-           (reset! *result (handler repo conn args))))))
+           (reset! *result (handler conn args))))))
 
     @*result))

deps/outliner/src/logseq/outliner/op.cljs

@@ -6,7 +6,7 @@
             [logseq.db.common.property-util :as db-property-util]))
 
 (defprotocol INode
-  (-save [this *txs-state conn repo date-formatter opts])
+  (-save [this *txs-state conn opts])
   (-del [this *txs-state db]))
 
 (defn- blocks->vec-tree-aux

deps/outliner/src/logseq/outliner/tree.cljs

@@ -13,7 +13,7 @@
           property-value (:user.property/default (db-test/find-block-by-content @conn "b1"))
           _ (assert (:db/id property-value))
           block (db-test/find-block-by-content @conn "b1")]
-      (outliner-core/delete-blocks! nil conn nil [block] {})
+      (outliner-core/delete-blocks! conn [block] {})
       (is (nil? (db-test/find-block-by-content @conn "b1")))
       (is (nil? (db-test/find-block-by-content @conn "test block"))))))
 
@@ -32,7 +32,7 @@
                                 :block/parent (:db/id page1)}])
           b3 (db-test/find-block-by-content @conn "b3")
           b4 (db-test/find-block-by-content @conn "b4")]
-      (outliner-core/delete-blocks! nil conn nil [b3 b4 page2] {})
+      (outliner-core/delete-blocks! conn [b3 b4 page2] {})
       (is (some? (db-test/find-block-by-content @conn "b3")))
       (is (some? (db-test/find-block-by-content @conn "b4")))
       (let [page2' (ldb/get-page @conn "page2")]

deps/outliner/test/logseq/outliner/core_test.cljs

@@ -62,7 +62,5 @@
 <script defer src="/static/js/tabler-icons-react.min.js"></script>
 <script defer src="/static/js/tabler.ext.js"></script>
 <script defer src="/static/js/code-editor.js"></script>
-<script defer src="/static/js/tldraw.js"></script>
-<script defer src="/static/js/excalidraw.js"></script>
 </body>
 </html>

public/index.html

@@ -32,11 +32,7 @@
   [conn ops opts]
   (when (seq ops)
     (if util/node-test?
-      (outliner-op/apply-ops! (state/get-current-repo)
-                              conn
-                              ops
-                              (state/get-date-formatter)
-                              opts)
+      (outliner-op/apply-ops! conn ops opts)
       (let [opts' (assoc opts
                          :client-id (:client-id @state/state)
                          :local-tx? true)

src/main/frontend/db/transact.cljs

@@ -606,7 +606,7 @@
     (try
       (worker-util/profile
        "apply outliner ops"
-       (outliner-op/apply-ops! repo conn ops (worker-state/get-date-formatter repo) opts))
+       (outliner-op/apply-ops! conn ops opts))
       (catch :default e
         (let [data (ex-data e)
               {:keys [type payload]} (when (map? data) data)]
@@ -783,30 +783,29 @@
   (throw (ex-info "Rename page is a file graph only operation" {})))
 
 (defn- delete-page!
-  [repo conn page-uuid]
+  [conn page-uuid]
   (let [error-handler (fn [{:keys [msg]}]
                         (worker-util/post-message :notification
                                                   [[:div [:p msg]] :error]))]
-    (worker-page/delete! repo conn page-uuid {:error-handler error-handler})))
+    (worker-page/delete! conn page-uuid {:error-handler error-handler})))
 
 (defn- create-page!
-  [repo conn title options]
-  (let [config (worker-state/get-config repo)]
-    (try
-      (worker-page/create! repo conn config title options)
-      (catch :default e
-        (js/console.error e)
-        (throw e)))))
+  [conn title options]
+  (try
+    (worker-page/create! conn title options)
+    (catch :default e
+      (js/console.error e)
+      (throw e))))
 
 (defn- outliner-register-op-handlers!
   []
   (outliner-op/register-op-handlers!
-   {:create-page (fn [repo conn [title options]]
-                   (create-page! repo conn title options))
+   {:create-page (fn [conn [title options]]
+                   (create-page! conn title options))
     :rename-page (fn [& _]
                    (rename-page!))
-    :delete-page (fn [repo conn [page-uuid]]
-                   (delete-page! repo conn page-uuid))}))
+    :delete-page (fn [conn [page-uuid]]
+                   (delete-page! conn page-uuid))}))
 
 (defn- on-become-master
   [repo start-opts]

src/main/frontend/worker/db_worker.cljs

@@ -1,16 +1,14 @@
 (ns frontend.worker.handler.page
   "Page operations"
-  (:require [logseq.common.config :as common-config]
-            [logseq.common.util :as common-util]
+  (:require [logseq.common.util :as common-util]
             [logseq.db :as ldb]
             [logseq.graph-parser.block :as gp-block]
             [logseq.outliner.page :as outliner-page]))
 
 (defn rtc-create-page!
-  [conn config title {:keys [uuid old-db-id]}]
+  [conn title date-formatter {:keys [uuid old-db-id]}]
   (assert (uuid? uuid) (str "rtc-create-page! `uuid` is not a uuid " uuid))
-  (let [date-formatter    (common-config/get-date-formatter config)
-        title (outliner-page/sanitize-title title)
+  (let [title (outliner-page/sanitize-title title)
         page-name (common-util/page-name-sanity-lc title)
         page              (cond-> (gp-block/page-name->map title @conn true date-formatter
                                                            {:page-uuid uuid
@@ -32,11 +30,11 @@
    * :persist-op?              - when true, add an update-page op
    * :properties               - properties to add to the page
   TODO: Add other options"
-  [repo conn config title & {:as options}]
+  [conn title & {:as options}]
   (outliner-page/create! conn title options))
 
 (defn delete!
   "Deletes a page. Returns true if able to delete page. If unable to delete,
   calls error-handler fn and returns false"
-  [repo conn page-uuid & {:as options}]
+  [conn page-uuid & {:as options}]
   (outliner-page/delete! conn page-uuid options))

src/main/frontend/worker/handler/page.cljs

@@ -96,9 +96,8 @@
                                                                                                                                               (:block/uuid e)))))))]
                                                                           blocks))))]
                                      (when (seq template-blocks)
-                                       ;; FIXME: outliner core apis shouldn't use `repo`
                                        (let [result (outliner-core/insert-blocks
-                                                     repo db template-blocks object
+                                                     db template-blocks object
                                                      {:sibling? false
                                                       :keep-uuid? journal-template?
                                                       :outliner-op :insert-template-blocks})]

src/main/frontend/worker/pipeline.cljs

@@ -39,7 +39,7 @@
       (do (assert (and (pos? (:t apply-ops-resp)) (pos? (:t-query-end apply-ops-resp))) apply-ops-resp)
           (m/?
            (r.remote-update/task--apply-remote-update
-            graph-uuid repo conn date-formatter {:type :remote-update :value apply-ops-resp} aes-key add-log-fn))))))
+            graph-uuid repo conn {:type :remote-update :value apply-ops-resp} aes-key add-log-fn))))))
 
 (defn- new-task--init-request
   [get-ws-create-task graph-uuid major-schema-version repo conn *last-calibrate-t *server-schema-version add-log-fn]
@@ -543,7 +543,7 @@
               (do (assert (and (pos? (:t r)) (pos? (:t-query-end r))) r)
                   (m/?
                    (r.remote-update/task--apply-remote-update
-                    graph-uuid repo conn date-formatter {:type :remote-update :value r} aes-key add-log-fn))
+                    graph-uuid repo conn {:type :remote-update :value r} aes-key add-log-fn))
                   (add-log-fn :rtc.log/push-local-update {:remote-t (:t r) :remote-t-query-end (:t-query-end r)})))))))))
 
 (defn new-task--pull-remote-data