diff --git a/deps/outliner/src/logseq/outliner/page.cljs b/deps/outliner/src/logseq/outliner/page.cljs index 7c985eb50c..6a90b942b4 100644 --- a/deps/outliner/src/logseq/outliner/page.cljs +++ b/deps/outliner/src/logseq/outliner/page.cljs @@ -44,7 +44,7 @@ (when tx [tx]))))) refs)] tx-data)))) -(defn build-page-retract-tx +(defn- build-page-retract-tx "Build cleanup tx-data for deleting a schema page. This is pure and can be reused by sync repair." [db page & [{:keys [include-page-retract?] diff --git a/deps/outliner/src/logseq/outliner/recycle.cljs b/deps/outliner/src/logseq/outliner/recycle.cljs index 1ee37ffec6..06a8afdb59 100644 --- a/deps/outliner/src/logseq/outliner/recycle.cljs +++ b/deps/outliner/src/logseq/outliner/recycle.cljs @@ -8,10 +8,10 @@ [logseq.db.common.order :as db-order])) (def ^:private recycle-page-title "Recycle") -(def retention-ms (* 60 24 3600 1000)) +(def ^:private retention-ms (* 60 24 3600 1000)) (def gc-interval-ms (* 24 3600 1000)) -(defn recycled? +(defn- recycled? [entity] (some? (:logseq.property/deleted-at entity))) @@ -27,7 +27,7 @@ :logseq.property/hide? true :logseq.property/built-in? true})) -(defn recycle-page +(defn- recycle-page [db] (ldb/get-built-in-page db recycle-page-title)) @@ -194,7 +194,7 @@ :else nil))) -(defn restore-tx-data +(defn- restore-tx-data [db root] (when-let [{:keys [parent page order]} (restore-target db root)] (let [subtree (when-not (ldb/page? root) @@ -229,7 +229,7 @@ (ldb/transact! conn tx-data {:outliner-op :restore-recycled}) true))) -(defn gc-tx-data +(defn- gc-tx-data [db {:keys [now-ms] :or {now-ms (common-util/time-ms)}}] (let [cutoff (- now-ms retention-ms)] (->> diff --git a/src/main/frontend/undo_redo.cljs b/src/main/frontend/undo_redo.cljs index 28f41335d6..9593727ef9 100644 --- a/src/main/frontend/undo_redo.cljs +++ b/src/main/frontend/undo_redo.cljs @@ -3,12 +3,12 @@ (:require [datascript.core :as d] [frontend.db :as db] [frontend.state :as state] - [frontend.undo-redo-validate :as undo-validate] [frontend.util :as util] [lambdaisland.glogi :as log] [logseq.common.defkeywords :refer [defkeywords]] [logseq.db :as ldb] [logseq.outliner.recycle :as outliner-recycle] + [logseq.undo-redo-validate :as undo-validate] [malli.core :as m] [malli.util :as mu] [promesa.core :as p])) diff --git a/src/main/frontend/worker/sync/apply_txs.cljs b/src/main/frontend/worker/sync/apply_txs.cljs index 22f5ee6347..58fb663de7 100644 --- a/src/main/frontend/worker/sync/apply_txs.cljs +++ b/src/main/frontend/worker/sync/apply_txs.cljs @@ -2,7 +2,6 @@ "Pending tx and remote tx application helpers for db sync." (:require [clojure.set :as set] [datascript.core :as d] - [frontend.undo-redo-validate :as undo-validate] [frontend.worker.shared-service :as shared-service] [frontend.worker.state :as worker-state] [frontend.worker.sync.assets :as sync-assets] @@ -22,6 +21,7 @@ [logseq.db.frontend.schema :as db-schema] [logseq.db.sqlite.util :as sqlite-util] [logseq.outliner.recycle :as outliner-recycle] + [logseq.undo-redo-validate :as undo-validate] [promesa.core :as p])) (defonce *repo->latest-remote-tx (atom {})) diff --git a/src/main/frontend/undo_redo_validate.cljs b/src/main/logseq/undo_redo_validate.cljs similarity index 99% rename from src/main/frontend/undo_redo_validate.cljs rename to src/main/logseq/undo_redo_validate.cljs index 859663c4df..fe93669829 100644 --- a/src/main/frontend/undo_redo_validate.cljs +++ b/src/main/logseq/undo_redo_validate.cljs @@ -1,4 +1,4 @@ -(ns frontend.undo-redo-validate +(ns logseq.undo-redo-validate "Undo redo validate" (:require [clojure.set :as set] [datascript.core :as d] diff --git a/src/test/frontend/undo_redo_test.cljs b/src/test/frontend/undo_redo_test.cljs index 213f40c7df..e08f66e22e 100644 --- a/src/test/frontend/undo_redo_test.cljs +++ b/src/test/frontend/undo_redo_test.cljs @@ -7,11 +7,11 @@ [frontend.state :as state] [frontend.test.helper :as test-helper] [frontend.undo-redo :as undo-redo] - [frontend.undo-redo-validate :as undo-validate] [frontend.worker.db-listener :as worker-db-listener] [logseq.db :as ldb] [logseq.outliner.core :as outliner-core] - [logseq.outliner.op :as outliner-op])) + [logseq.outliner.op :as outliner-op] + [logseq.undo-redo-validate :as undo-validate])) ;; TODO: random property ops test diff --git a/src/test/frontend/worker/db_sync_test.cljs b/src/test/frontend/worker/db_sync_test.cljs index 35890a5e70..5cfdf718a8 100644 --- a/src/test/frontend/worker/db_sync_test.cljs +++ b/src/test/frontend/worker/db_sync_test.cljs @@ -3,7 +3,6 @@ [clojure.string :as string] [datascript.core :as d] [frontend.common.crypt :as crypt] - [frontend.undo-redo-validate :as undo-validate] [frontend.worker-common.util :as worker-util] [frontend.worker.handler.page :as worker-page] [frontend.worker.pipeline :as worker-pipeline] @@ -33,6 +32,7 @@ [logseq.outliner.op :as outliner-op] [logseq.outliner.page :as outliner-page] [logseq.outliner.property :as outliner-property] + [logseq.undo-redo-validate :as undo-validate] [promesa.core :as p])) (def ^:private test-repo "test-db-sync-repo")