clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-05-15 00:12:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: hide class hierarchy

Browse Source
This commit is contained in:
Tienson Qin
2026-05-13 22:14:47 +08:00
parent 0d1654893b
commit ec52376b87
2 changed files with 43 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/frontend/handler/block.cljs
View File

@@ -1,5 +1,6 @@
(ns ^:no-doc frontend.handler.block
(:require [clojure.string :as string]
[datascript.core :as d]
[datascript.impl.entity :as de]
[dommy.core :as dom]
[frontend.config :as config]
@@ -77,6 +78,18 @@
(or "")
(subs 0 pos))))
(defn- class-title-conflicts?
[class-entity]
(let [class-title (:block/title class-entity)
class-id (:db/id class-entity)]
(when-let [db (and class-title (db/get-db))]
(->> (d/datoms db :avet :block/title class-title)
(some (fn [datom]
(let [entity (d/entity db (:e datom))]
(and (not= class-id (:db/id entity))
(ldb/class? entity)
(not (ldb/recycled? entity))))))))))
(defn mark-last-input-time!
[repo]
(when repo
@@ -115,7 +128,9 @@
(ldb/private-tags (:db/ident t))))
(map (fn [tag] (if (number? tag) (db/entity tag) tag)) (:block/tags block))))
base-title (if class?
(ldb/get-class-title-with-extends block)
(if (class-title-conflicts? block-e)
(ldb/get-class-title-with-extends block-e)
(:block/title block))
(:block/title block))
trunc-title (if (and truncate? base-title (> (count base-title) 256))
(subs base-title 0 256)

28
src/test/frontend/handler/block_test.cljs
View File

@@ -1,7 +1,10 @@
(ns frontend.handler.block-test
(:require [cljs.test :refer [deftest is testing]]
[clojure.string :as string]
[frontend.handler.block :as block-handler]))
[datascript.core :as d]
[frontend.db :as db]
[frontend.handler.block :as block-handler]
[logseq.db.test.helper :as db-test]))
(deftest block-unique-title-no-truncate-when-disabled
(testing "disable truncate for cmdk path"
@@ -21,3 +24,26 @@
(is (string/starts-with? result base-title))
(is (string/ends-with? result "#example"))
(is (> (count result) 256)))))
(deftest block-unique-title-hides-class-parent-when-title-is-unique
(let [conn (db-test/create-conn-with-blocks
{:classes {:Project {:block/title "Project"}
:Milestone {:block/title "Milestone"
:build/class-extends [:Project]}}})
milestone (d/entity @conn :user.class/Milestone)]
(with-redefs [db/get-db (fn [] @conn)]
(is (= "Milestone" (block-handler/block-unique-title milestone))))))
(deftest block-unique-title-shows-class-parent-when-title-conflicts
(let [conn (db-test/create-conn-with-blocks
{:classes {:Project {:block/title "Project"}
:Area {:block/title "Area"}
:user.class/Milestone {:block/title "Milestone"
:build/class-extends [:Project]}
:other.class/Milestone {:block/title "Milestone"
:build/class-extends [:Area]}}})
project-milestone (d/entity @conn :user.class/Milestone)
area-milestone (d/entity @conn :other.class/Milestone)]
(with-redefs [db/get-db (fn [] @conn)]
(is (= "Project/Milestone" (block-handler/block-unique-title project-milestone)))
(is (= "Area/Milestone" (block-handler/block-unique-title area-milestone))))))