clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-06-02 11:21:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feat/db' into enhance/plugin-web

Browse Source
This commit is contained in:
charlie
2024-12-28 11:48:58 +08:00
parent ca03681754 8e07bea746
commit 91ef984f7a
24 changed files with 240 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/frontend/components/block.cljs
View File

@@ -19,8 +19,8 @@
[frontend.components.property.value :as pv]
[frontend.components.query :as query]
[frontend.components.query.builder :as query-builder-component]
[frontend.components.svg :as svg]
[frontend.components.select :as select]
[frontend.components.svg :as svg]
[frontend.config :as config]
[frontend.context.i18n :refer [t]]
[frontend.date :as date]
@@ -78,6 +78,7 @@
[logseq.common.util.page-ref :as page-ref]
[logseq.db :as ldb]
[logseq.db.frontend.content :as db-content]
[logseq.db.frontend.entity-plus :as entity-plus]
[logseq.graph-parser.block :as gp-block]
[logseq.graph-parser.mldoc :as gp-mldoc]
[logseq.graph-parser.text :as text]
@@ -2285,7 +2286,9 @@
;; highlight ref block (area)
(when area? [(hl-ref)])
(when (and (seq block-ast-title) (ldb/class-instance? (db/entity :logseq.class/Cards) block))
(when (and (seq block-ast-title) (ldb/class-instance?
(entity-plus/entity-memoized (db/get-db) :logseq.class/Cards)
block))
[(ui/tooltip
(shui/button
{:variant :ghost
@@ -2302,7 +2305,8 @@
(let [collapsed? (:collapsed? config)
block' (db/entity (:db/id block))
node-display-type (:logseq.property.node/display-type block')
query? (ldb/class-instance? (db/entity :logseq.class/Query) block')
db (db/get-db)
query? (ldb/class-instance? (entity-plus/entity-memoized db :logseq.class/Query) block')
query (:logseq.property/query block')
advanced-query? (and query? (= :code node-display-type))]
(cond
@@ -3278,7 +3282,8 @@
(rum/defc query-property-cp < rum/reactive db-mixins/query
[block config collapsed?]
(let [block (db/entity (:db/id block))
query? (ldb/class-instance? (db/entity :logseq.class/Query) block)]
db (db/get-db)
query? (ldb/class-instance? (entity-plus/entity-memoized db :logseq.class/Query) block)]
(when (and query? (not collapsed?))
(let [query-id (:db/id (:logseq.property/query block))
query (some-> query-id db/sub-block)
@@ -3497,7 +3502,7 @@
(db-properties-cp config block {:in-block-container? true})])
(when (and db-based? (not collapsed?) (not (or table? property?))
(ldb/class-instance? (db/entity :logseq.class/Query) block))
(ldb/class-instance? (entity-plus/entity-memoized (db/get-db) :logseq.class/Query) block))
(let [query-block (:logseq.property/query (db/entity (:db/id block)))
query-block (if query-block (db/sub-block (:db/id query-block)) query-block)
query (:block/title query-block)
@@ -3506,7 +3511,9 @@
[:div {:style {:padding-left 42}}
(query/custom-query (wrap-query-components (assoc config
:dsl-query? (not advanced-query?)
:cards? (ldb/class-instance? (db/entity :logseq.class/Cards) block)))
:cards? (ldb/class-instance? (entity-plus/entity-memoized
(db/get-db)
:logseq.class/Cards) block)))
(if advanced-query? result {:builder nil
:query (query-builder-component/sanitize-q query)}))]))

9
src/main/frontend/components/property.cljs
View File

@@ -2,7 +2,6 @@
"Block properties management."
(:require [clojure.set :as set]
[clojure.string :as string]
[dommy.core :as d]
[frontend.components.dnd :as dnd]
[frontend.components.icon :as icon-component]
[frontend.components.property.config :as property-config]
@@ -10,16 +9,16 @@
[frontend.components.property.value :as pv]
[frontend.components.select :as select]
[frontend.components.svg :as svg]
[frontend.handler.property.util :as pu]
[frontend.config :as config]
[frontend.db :as db]
[frontend.db.model :as db-model]
[frontend.db-mixins :as db-mixins]
[frontend.db.async :as db-async]
[frontend.db.model :as db-model]
[frontend.handler.db-based.property :as db-property-handler]
[frontend.handler.notification :as notification]
[frontend.handler.route :as route-handler]
[frontend.handler.editor :as editor-handler]
[frontend.handler.notification :as notification]
[frontend.handler.property.util :as pu]
[frontend.handler.route :as route-handler]
[frontend.mixins :as mixins]
[frontend.modules.shortcut.core :as shortcut]
[frontend.state :as state]

19
src/main/frontend/core.cljs
View File

@@ -2,6 +2,7 @@
"Entry ns for the mobile, browser and electron frontend apps"
{:dev/always true}
(:require [frontend.common-keywords]
[frontend.common.schema-register :as sr]
[frontend.components.plugins :as plugins]
[frontend.config :as config]
[frontend.fs.sync :as sync]
@@ -11,7 +12,6 @@
[frontend.log]
[frontend.page :as page]
[frontend.routes :as routes]
[frontend.common.schema-register :as sr]
[frontend.spec]
[logseq.api]
[malli.dev.cljs :as md]
@@ -58,11 +58,28 @@
(when config/dev?
(js/setTimeout #(sync/<sync-start) 1000))))
(comment
(def d-entity-count (volatile! 0))
(def ident->count (volatile! {}))
(def time-sum (volatile! 0))
(defn- setup-entity-profile!
[]
(let [origin-d-entity d/entity]
(set! d/entity (fn [& args]
(let [{r :result time :time} (util/with-time (apply origin-d-entity args))
k (last args)]
(vswap! d-entity-count inc)
(vswap! ident->count update k inc)
(vswap! time-sum #(+ time %))
(println @d-entity-count (:db/id r) k (get @ident->count k) @time-sum "ms")
r))))))
(defn ^:export init []
;; init is called ONCE when the page loads
;; this is called in the index.html and must be exported
;; so it is available even in :advanced release builds
;; (setup-entity-profile!)
(plugin-handler/setup!
#(handler/start! start)))

15
src/main/frontend/db/rtc/debug_ui.cljs
View File

@@ -3,6 +3,7 @@
(:require [fipp.edn :as fipp]
[frontend.common.missionary-util :as c.m]
[frontend.db :as db]
[frontend.handler.db-based.rtc-flows :as rtc-flows]
[frontend.handler.user :as user]
[frontend.persist-db.browser :as db-browser]
[frontend.state :as state]
@@ -15,7 +16,6 @@
[rum.core :as rum]))
(defonce debug-state (:rtc/state @state/state))
(defonce rtc-log-flow (m/watch (:rtc/log @state/state)))
(defn- stop
[]
@@ -37,7 +37,7 @@
logs)]
(reset! (get state ::logs) logs*)
logs*))
nil rtc-log-flow)
nil rtc-flows/rtc-log-flow)
::sub-logs)]
(reset! (get state ::sub-log-canceler) canceler)
state))
@@ -102,6 +102,7 @@
:remote-graphs (:remote-graphs debug-state*)
:online-users (:online-users debug-state*)
:auto-push? (:auto-push? debug-state*)
:remote-profile? (:remote-profile? debug-state*)
:current-page (state/get-current-page)
:blocks-count (when-let [page (state/get-current-page)]
(count (:block/_page (db/get-page page))))}
@@ -126,7 +127,15 @@
{:on-click
(fn []
(let [^object worker @db-browser/*worker]
(.rtc-toggle-auto-push worker (state/get-current-repo))))})]
(.rtc-toggle-auto-push worker)))})]
[:div.mr-2 (ui/button (str "Toggle remote profile("
(if (:remote-profile? debug-state*)
"ON" "OFF")
")")
{:on-click
(fn []
(let [^object worker @db-browser/*worker]
(.rtc-toggle-remote-profile worker)))})]
[:div (shui/button
{:variant :outline
:class "text-red-rx-09 border-red-rx-08 hover:text-red-rx-10"

3
src/main/frontend/extensions/fsrs.cljs
View File

@@ -18,6 +18,7 @@
[frontend.ui :as ui]
[frontend.util :as util]
[logseq.db :as ldb]
[logseq.db.frontend.entity-plus :as entity-plus]
[logseq.shui.ui :as shui]
[missionary.core :as m]
[open-spaced-repetition.cljc-fsrs.core :as fsrs.core]
@@ -247,7 +248,7 @@
all-cards (concat
[{:db/id :global
:block/title "All cards"}]
(db-model/get-class-objects repo (:db/id (db/entity :logseq.class/Cards))))
(db-model/get-class-objects repo (:db/id (entity-plus/entity-memoized (db/get-db) :logseq.class/Cards))))
*block-ids (::block-ids state)
block-ids (rum/react *block-ids)
loading? (rum/react (::loading? state))

11
src/main/frontend/flows.cljs Normal file
View File

@@ -0,0 +1,11 @@
(ns frontend.flows
"This ns contains some event flows."
(:require [missionary.core :as m]))
(def *current-repo (atom nil))
(def current-repo-flow
"Like get-current-repo."
(m/eduction
(dedupe)
(m/watch *current-repo)))

16
src/main/frontend/handler/editor.cljs
View File

@@ -2,6 +2,7 @@
(:require [clojure.set :as set]
[clojure.string :as string]
[clojure.walk :as w]
[datascript.core :as d]
[dommy.core :as dom]
[frontend.commands :as commands]
[frontend.config :as config]
@@ -54,18 +55,18 @@
[logseq.common.util.block-ref :as block-ref]
[logseq.common.util.page-ref :as page-ref]
[logseq.db :as ldb]
[logseq.db.frontend.schema :as db-schema]
[logseq.db.frontend.entity-plus :as entity-plus]
[logseq.db.frontend.property :as db-property]
[logseq.db.frontend.schema :as db-schema]
[logseq.graph-parser.block :as gp-block]
[logseq.graph-parser.mldoc :as gp-mldoc]
[logseq.graph-parser.property :as gp-property]
[logseq.graph-parser.text :as text]
[logseq.graph-parser.utf8 :as utf8]
[logseq.outliner.core :as outliner-core]
[promesa.core :as p]
[rum.core :as rum]
[logseq.outliner.property :as outliner-property]
[datascript.core :as d]))
[promesa.core :as p]
[rum.core :as rum]))
;; FIXME: should support multiple images concurrently uploading
@@ -3457,15 +3458,16 @@
(defn- db-collapsable?
[block]
(let [class-properties (:classes-properties (outliner-property/get-block-classes-properties (db/get-db) (:db/id block)))
properties (->> (map :a (d/datoms (db/get-db) :eavt (:db/id block)))
(map db/entity)
db (db/get-db)
properties (->> (map :a (d/datoms db :eavt (:db/id block)))
(map (partial entity-plus/entity-memoized db))
(concat class-properties)
(remove (fn [e] (db-property/db-attribute-properties (:db/ident e))))
(remove outliner-property/property-with-other-position?)
(remove (fn [e] (:hide? (:block/schema e))))
(remove nil?))]
(or (seq properties)
(ldb/class-instance? (db/entity :logseq.class/Query) block))))
(ldb/class-instance? (entity-plus/entity-memoized db :logseq.class/Query) block))))
(defn collapsable?
([block-id]

5
src/main/frontend/state.cljs
View File

@@ -11,6 +11,7 @@
[electron.ipc :as ipc]
[frontend.db.conn-state :as db-conn-state]
[frontend.db.transact :as db-transact]
[frontend.flows :as flows]
[frontend.mobile.util :as mobile-util]
[frontend.rum :as r]
[frontend.spec.storage :as storage-spec]
@@ -21,6 +22,7 @@
[goog.object :as gobj]
[logseq.common.config :as common-config]
[logseq.db :as ldb]
[logseq.db.frontend.entity-plus :as entity-plus]
[logseq.db.sqlite.util :as sqlite-util]
[logseq.shui.dialog.core :as shui-dialog]
[logseq.shui.ui :as shui]
@@ -599,7 +601,7 @@ should be done through this fn in order to get global config and config defaults
(let [repo (get-current-repo)]
(if (sqlite-util/db-based-graph? repo)
(when-let [conn (db-conn-state/get-conn repo)]
(get (d/entity @conn :logseq.class/Journal)
(get (entity-plus/entity-memoized @conn :logseq.class/Journal)
:logseq.property.journal/title-format
"MMM do, yyyy"))
(common-config/get-date-formatter (get-config)))))
@@ -978,6 +980,7 @@ Similar to re-frame subscriptions"
(defn set-current-repo!
[repo]
(swap! state assoc :git/current-repo repo)
(reset! flows/*current-repo repo)
(if repo
(storage/set :git/current-repo repo)
(storage/remove :git/current-repo))

4
src/main/frontend/worker/db_worker.cljs
View File

@@ -755,6 +755,10 @@
[this]
(rtc-core/rtc-toggle-auto-push))
(rtc-toggle-remote-profile
[this]
(rtc-core/rtc-toggle-remote-profile))
(rtc-grant-graph-access
[this token graph-uuid target-user-uuids-str target-user-emails-str]
(let [target-user-uuids (ldb/read-transit-str target-user-uuids-str)

9
src/main/frontend/worker/handler/page/db_based/page.cljs
View File

@@ -7,15 +7,16 @@
[logseq.common.util.namespace :as ns-util]
[logseq.db :as ldb]
[logseq.db.frontend.class :as db-class]
[logseq.db.frontend.entity-plus :as entity-plus]
[logseq.db.frontend.entity-util :as entity-util]
[logseq.db.frontend.malli-schema :as db-malli-schema]
[logseq.db.frontend.order :as db-order]
[logseq.db.frontend.property.build :as db-property-build]
[logseq.db.frontend.property.util :as db-property-util]
[logseq.db.sqlite.util :as sqlite-util]
[logseq.graph-parser.block :as gp-block]
[logseq.graph-parser.text :as text]
[logseq.outliner.validate :as outliner-validate]
[logseq.db.frontend.entity-util :as entity-util]
[logseq.db.frontend.malli-schema :as db-malli-schema]))
[logseq.outliner.validate :as outliner-validate]))
(defn- build-page-tx [conn properties page {:keys [whiteboard? class? tags]}]
(when (:block/uuid page)
@@ -168,7 +169,7 @@
skip-existing-page-check? false}
:as options}]
(let [db @conn
date-formatter (:logseq.property.journal/title-format (d/entity db :logseq.class/Journal))
date-formatter (:logseq.property.journal/title-format (entity-plus/entity-memoized db :logseq.class/Journal))
title (sanitize-title title*)
types (cond class?
#{:logseq.class/Tag}

7
src/main/frontend/worker/rtc/client.cljs
View File

@@ -326,7 +326,7 @@
(defn new-task--push-local-ops
"Return a task: push local updates"
[repo conn graph-uuid date-formatter get-ws-create-task add-log-fn]
[repo conn graph-uuid date-formatter get-ws-create-task *remote-profile? add-log-fn]
(m/sp
(let [block-ops-map-coll (client-op/get&remove-all-block-ops repo)]
(when-let [block-uuid->remote-ops (not-empty (gen-block-uuid->remote-ops @conn block-ops-map-coll))]
@@ -336,8 +336,9 @@
(let [local-tx (client-op/get-local-tx repo)
r (try
(m/? (ws-util/send&recv get-ws-create-task
{:action "apply-ops" :graph-uuid graph-uuid
:ops ops-for-remote :t-before (or local-tx 1)}))
(cond-> {:action "apply-ops" :graph-uuid graph-uuid
:ops ops-for-remote :t-before (or local-tx 1)}
(true? @*remote-profile?) (assoc :profile true))))
(catch :default e
(rollback repo block-ops-map-coll)
(throw e)))]

7
src/main/frontend/worker/rtc/const.cljs
View File

@@ -78,6 +78,7 @@
"TODO: split this mix schema to multiple ones"
[:map
[:req-id :string]
[:profile {:optional true} :map]
[:t {:optional true} :int]
[:t-before {:optional true} :int]
[:failed-ops {:optional true} [:sequential to-ws-op-schema]]
@@ -172,7 +173,9 @@
(fn [api-schema]
(let [[api-name [type']] api-schema]
(if (= :map type')
[api-name (vec (concat (second api-schema) [[:req-id :string] [:action :string]]))]
[api-name (vec (concat (second api-schema) [[:req-id :string]
[:action :string]
[:profile {:optional true} :boolean]]))]
api-schema)))
api-schema-seq)))))
@@ -190,12 +193,14 @@
[:map
[:req-id :string]
[:action :string]
[:profile {:optional true} :boolean]
[:graph-uuid :string]
[:ops [:sequential to-ws-op-schema]]
[:t-before :int]]
[:map
[:req-id :string]
[:action :string]
[:profile {:optional true} :boolean]
[:s3-key :string]]]]
["presign-put-temp-s3-obj"
[:map]]

41
src/main/frontend/worker/rtc/core.cljs
View File

@@ -180,6 +180,7 @@
& {:keys [auto-push? debug-ws-url] :or {auto-push? true}}]
(let [ws-url (or debug-ws-url (ws-util/get-ws-url token))
*auto-push? (atom auto-push?)
*remote-profile? (atom false)
*last-calibrate-t (atom nil)
*online-users (atom nil)
*assets-sync-loop-canceler (atom nil)
@@ -195,10 +196,11 @@
(r.asset/create-assets-sync-loop repo get-ws-create-task graph-uuid 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))
:*rtc-auto-push? *auto-push?
:*online-users *online-users
:onstarted-task started-dfv
{:rtc-state-flow (create-rtc-state-flow (create-ws-state-flow *current-ws))
:*rtc-auto-push? *auto-push?
:*rtc-remote-profile? *remote-profile?
:*online-users *online-users
:onstarted-task started-dfv
:rtc-loop-task
(holding-rtc-lock
started-dfv
@@ -225,7 +227,7 @@
:local-update-check
(m/? (r.client/new-task--push-local-ops
repo conn graph-uuid date-formatter
get-ws-create-task add-log-fn))
get-ws-create-task *remote-profile? add-log-fn))
:online-users-updated
(reset! *online-users (:online-users (:value event)))
@@ -246,16 +248,21 @@
(when @*assets-sync-loop-canceler (@*assets-sync-loop-canceler))))))}))
(def ^:private empty-rtc-loop-metadata
{:graph-uuid nil
{:repo nil
:graph-uuid nil
:user-uuid nil
:rtc-state-flow nil
:*rtc-auto-push? nil
:*rtc-remote-profile? nil
:*online-users nil
:*rtc-lock nil
:canceler nil
:*last-stop-exception nil})
(defonce ^:private *rtc-loop-metadata (atom empty-rtc-loop-metadata))
(defonce ^:private *rtc-loop-metadata (atom empty-rtc-loop-metadata
:validator
(fn [v] (= (set (keys empty-rtc-loop-metadata))
(set (keys v))))))
;;; ================ API ================
(defn new-task--rtc-start
@@ -268,7 +275,7 @@
(let [user-uuid (:sub (worker-util/parse-jwt token))
config (worker-state/get-config repo)
date-formatter (common-config/get-date-formatter config)
{:keys [rtc-state-flow *rtc-auto-push? rtc-loop-task *online-users onstarted-task]}
{:keys [rtc-state-flow *rtc-auto-push? *rtc-remote-profile? rtc-loop-task *online-users onstarted-task]}
(create-rtc-loop graph-uuid repo conn date-formatter token)
*last-stop-exception (atom nil)
canceler (c.m/run-task rtc-loop-task :rtc-loop-task
@@ -283,6 +290,7 @@
:user-uuid user-uuid
:rtc-state-flow rtc-state-flow
:*rtc-auto-push? *rtc-auto-push?
:*rtc-remote-profile? *rtc-remote-profile?
:*online-users *online-users
:*rtc-lock *rtc-lock
:canceler canceler
@@ -303,6 +311,11 @@
(when-let [*auto-push? (:*rtc-auto-push? @*rtc-loop-metadata)]
(swap! *auto-push? not)))
(defn rtc-toggle-remote-profile
[]
(when-let [*rtc-remote-profile? (:*rtc-remote-profile? @*rtc-loop-metadata)]
(swap! *rtc-remote-profile? not)))
(defn new-task--get-graphs
[token]
(let [{:keys [get-ws-create-task]} (gen-get-ws-create-map--memoized (ws-util/get-ws-url token))]
@@ -356,14 +369,15 @@
(let [rtc-loop-metadata-flow (m/watch *rtc-loop-metadata)]
(m/ap
(let [{rtc-lock :*rtc-lock
:keys [repo graph-uuid user-uuid rtc-state-flow *rtc-auto-push? *online-users
*last-stop-exception]}
:keys [repo graph-uuid user-uuid rtc-state-flow *rtc-auto-push? *rtc-remote-profile?
*online-users *last-stop-exception]}
(m/?< rtc-loop-metadata-flow)]
(try
(when (and repo rtc-state-flow *rtc-auto-push? rtc-lock)
(m/?<
(m/latest
(fn [rtc-state rtc-auto-push? rtc-lock online-users pending-local-ops-count local-tx remote-tx]
(fn [rtc-state rtc-auto-push? rtc-remote-profile?
rtc-lock online-users pending-local-ops-count local-tx remote-tx]
{:graph-uuid graph-uuid
:user-uuid user-uuid
:unpushed-block-update-count pending-local-ops-count
@@ -372,9 +386,12 @@
:rtc-state rtc-state
:rtc-lock rtc-lock
:auto-push? rtc-auto-push?
:remote-profile? rtc-remote-profile?
:online-users online-users
:last-stop-exception-ex-data (some-> *last-stop-exception deref ex-data)})
rtc-state-flow (m/watch *rtc-auto-push?) (m/watch rtc-lock) (m/watch *online-users)
rtc-state-flow
(m/watch *rtc-auto-push?) (m/watch *rtc-remote-profile?)
(m/watch rtc-lock) (m/watch *online-users)
(client-op/create-pending-block-ops-count-flow repo)
(rtc-log-and-state/create-local-t-flow graph-uuid)
(rtc-log-and-state/create-remote-t-flow graph-uuid))))