|
@@ -56,13 +56,19 @@
|
|
|
(reset! query-state state)))
|
|
(reset! query-state state)))
|
|
|
|
|
|
|
|
(defn get-current-repo-refs-keys
|
|
(defn get-current-repo-refs-keys
|
|
|
- []
|
|
|
|
|
|
|
+ [{:keys [key data]}]
|
|
|
(when-let [current-repo (state/get-current-repo)]
|
|
(when-let [current-repo (state/get-current-repo)]
|
|
|
(->>
|
|
(->>
|
|
|
(map (fn [[repo k id]]
|
|
(map (fn [[repo k id]]
|
|
|
(when (and (= repo current-repo)
|
|
(when (and (= repo current-repo)
|
|
|
(contains? #{:block/refed-blocks :block/unlinked-refs} k))
|
|
(contains? #{:block/refed-blocks :block/unlinked-refs} k))
|
|
|
- [k id]))
|
|
|
|
|
|
|
+ (if (= k :block/refed-blocks)
|
|
|
|
|
+ (if (every? (fn [m]
|
|
|
|
|
+ (when (map? m)
|
|
|
|
|
+ (= id (:db/id (:block/page m))))) data)
|
|
|
|
|
+ nil
|
|
|
|
|
+ [k id])
|
|
|
|
|
+ [k id])))
|
|
|
(keys @query-state))
|
|
(keys @query-state))
|
|
|
(remove nil?))))
|
|
(remove nil?))))
|
|
|
|
|
|
|
@@ -250,7 +256,6 @@
|
|
|
|
|
|
|
|
(when current-page-id
|
|
(when current-page-id
|
|
|
[[:page/ref-pages current-page-id]
|
|
[[:page/ref-pages current-page-id]
|
|
|
- ;; [:block/refed-blocks current-page-id]
|
|
|
|
|
[:page/mentioned-pages current-page-id]])
|
|
[:page/mentioned-pages current-page-id]])
|
|
|
|
|
|
|
|
(apply concat
|
|
(apply concat
|
|
@@ -272,7 +277,8 @@
|
|
|
(when (= k :block/refed-blocks)
|
|
(when (= k :block/refed-blocks)
|
|
|
[:page/ref-pages page-id]))
|
|
[:page/ref-pages page-id]))
|
|
|
related-keys)
|
|
related-keys)
|
|
|
- all-refed-blocks (get-current-repo-refs-keys)
|
|
|
|
|
|
|
+ all-refed-blocks (get-current-repo-refs-keys {:key key
|
|
|
|
|
+ :data data})
|
|
|
custom-queries (some->>
|
|
custom-queries (some->>
|
|
|
(filter (fn [v]
|
|
(filter (fn [v]
|
|
|
(and (= (first v) (state/get-current-repo))
|
|
(and (= (first v) (state/get-current-repo))
|