Fix page-properties not using :property-pages/* config

pull/6138/head
Gabriel Horner 2022-07-21 13:59:16 -04:00
parent b3f2b4f6a3
commit c8864e777d
4 changed files with 30 additions and 11 deletions

View File

@ -480,8 +480,8 @@
(d/squuid)))
(defn get-page-refs-from-properties
[format properties db date-formatter]
(let [page-refs (get-page-ref-names-from-properties format properties {})]
[format properties db date-formatter user-config]
(let [page-refs (get-page-ref-names-from-properties format properties user-config)]
(map (fn [page] (page-name->map page true db true date-formatter)) page-refs)))
(defn- with-page-block-refs
@ -493,7 +493,7 @@
(update :refs (fn [col] (remove nil? col)))))
(defn- with-pre-block-if-exists
[blocks body pre-block-properties encoded-content {:keys [supported-formats db date-formatter]}]
[blocks body pre-block-properties encoded-content {:keys [supported-formats db date-formatter user-config]}]
(let [first-block (first blocks)
format (or (:block/format first-block) :markdown)
first-block-start-pos (get-in first-block [:block/meta :start_pos])
@ -506,7 +506,7 @@
(let [content (utf8/substring encoded-content 0 first-block-start-pos)
{:keys [properties properties-order]} pre-block-properties
id (get-custom-id-or-new-id {:properties properties})
property-refs (->> (get-page-refs-from-properties format properties db date-formatter)
property-refs (->> (get-page-refs-from-properties format properties db date-formatter user-config)
(map :block/original-name))
block {:uuid id
:content content

View File

@ -1,19 +1,19 @@
(ns logseq.graph-parser.extract-test
(:require [cljs.test :refer [deftest is]]
(:require [cljs.test :refer [deftest is are]]
[logseq.graph-parser.extract :as extract]
[clojure.pprint :as pprint]))
(defn- extract
[text]
(let [{:keys [blocks]} (extract/extract "a.md" text {:block-pattern "-"})
lefts (map (juxt :block/parent :block/left) blocks)]
lefts (map (juxt :block/parent :block/left) blocks)]
(if (not= (count lefts) (count (distinct lefts)))
(do
(pprint/pprint (map (fn [x] (select-keys x [:block/uuid :block/level :block/content :block/left])) blocks))
(throw (js/Error. ":block/parent && :block/left conflicts")))
(mapv :block/content blocks))))
(deftest test-extract
(deftest extract-blocks-for-headings
[]
(is (= ["a" "b" "c"]
(extract
@ -41,6 +41,21 @@
- i
- j"))))
(deftest extract-blocks-with-property-pages-config
[]
(are [extract-args expected-refs]
(= expected-refs
(->> (apply extract/extract extract-args)
:blocks
(mapcat #(->> % :block/refs (map :block/name)))
set))
["a.md" "foo:: #bar\nbaz:: #bing" {:block-pattern "-" :user-config {:property-pages/enabled? true}}]
#{"bar" "bing" "foo" "baz"}
["a.md" "foo:: #bar\nbaz:: #bing" {:block-pattern "-" :user-config {:property-pages/enabled? false}}]
#{"bar" "bing"}))
(deftest test-regression-1902
[]
(is (= ["line1" "line2" "line3" "line4"]

View File

@ -660,9 +660,11 @@
(defn properties-block
[properties format page]
(let [content (property/insert-properties format "" properties)
refs (gp-block/get-page-refs-from-properties format properties
refs (gp-block/get-page-refs-from-properties format
properties
(db/get-db (state/get-current-repo))
(state/get-date-formatter))]
(state/get-date-formatter)
(state/get-config))]
{:block/pre-block? true
:block/uuid (db/new-block-id)
:block/properties properties

View File

@ -74,9 +74,11 @@
(let [p (common-handler/get-page-default-properties title)
ps (merge p properties)
content (page-property/insert-properties format "" ps)
refs (gp-block/get-page-refs-from-properties format properties
refs (gp-block/get-page-refs-from-properties format
properties
(db/get-db (state/get-current-repo))
(state/get-date-formatter))]
(state/get-date-formatter)
(state/get-config))]
{:block/uuid (db/new-block-id)
:block/properties ps
:block/properties-order (keys ps)