Przeglądaj źródła

Try to hide filter directive

samfundev 5 lat temu
rodzic
commit
70dd56c09e

+ 2 - 1
src/main/frontend/components/block.cljs

@@ -1682,7 +1682,8 @@
        (let [format (:block/format config)]
          (for [[k v] m]
            (when (and (not (and (= k :macros) (empty? v))) ; empty macros
-)
+                      (not (= k :title))
+                      (not (= k :filter)))
              [:div.property
               [:span.font-medium.mr-1 (str (name k) ": ")]
               (if (coll? v)

+ 1 - 5
src/main/frontend/components/reference.cljs

@@ -58,13 +58,9 @@
           (or (= (first %) "Tag") (= (first (:url (second %))) "Search")))
         (:block/title (first (val ref-block))))))
 
-(defn in?
-  [elm coll]
-  (true? (some #(= elm %) coll)))
-
 (defn matches-filter
   [references filter-state]
-  (every? #(= (in? (first %) references) (second %)) filter-state))
+  (every? #(= (util/in? (first %) references) (second %)) filter-state))
 
 (rum/defc references < rum/reactive
   [page-name marker? priority?]

+ 3 - 2
src/main/frontend/handler/block.cljs

@@ -128,8 +128,9 @@
 (defn pre-block-with-only-title?
   [repo block-id]
   (when-let [block (db/entity repo [:block/uuid block-id])]
-    (let [properties (:page/properties (:block/page block))]
-      (and (:title properties)
+    (let [properties (:page/properties (:block/page block))
+          property-names (keys properties)]
+      (and (every? #(util/in? % '(:title :filter)) property-names)
            (= 1 (count properties))
            (let [ast (mldoc/->edn (:block/content block) (mldoc/default-config (:block/format block)))]
              (or

+ 6 - 0
src/main/frontend/util.cljs

@@ -996,3 +996,9 @@
 
   (= (get-relative-path "a/b/c/d/g.org" "a/b/c/e/f.org")
      "../e/f.org"))
+
+;; Modified from https://stackoverflow.com/a/3249777/8213163
+(defn in?
+  "true if coll contains elm"
+  [elm coll]
+  (true? (some #(= elm %) coll)))