status-im/re-frame
2
0
Fork 0
mirror of https://github.com/status-im/re-frame.git synced 2025-02-22 06:48:08 +00:00
Code Issues Projects Releases Wiki Activity

Fixup subscription error messages

Browse Source
This commit is contained in:
Daniel Compton 2018-02-02 15:12:23 +13:00
parent c4ccfbae8d
commit e9b679c64a
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
checkouts/re-frame-trace
View File

@ -1 +0,0 @@
../../re-frame-trace/

4
src/re_frame/subs.cljc
View File

@ -129,7 +129,7 @@
(trace/merge-trace! {:tags {:cached? false}}) (trace/merge-trace! {:tags {:cached? false}})
(if (nil? handler-fn) (if (nil? handler-fn)
(do (trace/merge-trace! {:error true}) (do (trace/merge-trace! {:error true})
(console :error (str "re-frame: no subscription handler registered for:" query-id ". Returning a nil subscription."))) (console :error (str "re-frame: no subscription handler registered for: " query-id ". Returning a nil subscription.")))
(cache-and-return query [] (handler-fn app-db query))))))) (cache-and-return query [] (handler-fn app-db query)))))))
([query dynv] ([query dynv]
@ -150,7 +150,7 @@
(console :warn "re-frame: your subscription's dynamic parameters that don't implement IReactiveAtom:" not-reactive))) (console :warn "re-frame: your subscription's dynamic parameters that don't implement IReactiveAtom:" not-reactive)))
(if (nil? handler-fn) (if (nil? handler-fn)
(do (trace/merge-trace! {:error true}) (do (trace/merge-trace! {:error true})
(console :error (str "re-frame: no subscription handler registered for:" query-id ". Returning a nil subscription."))) (console :error (str "re-frame: no subscription handler registered for: " query-id ". Returning a nil subscription.")))
(let [dyn-vals (make-reaction (fn [] (mapv deref dynv))) (let [dyn-vals (make-reaction (fn [] (mapv deref dynv)))
sub (make-reaction (fn [] (handler-fn app-db query @dyn-vals)))] sub (make-reaction (fn [] (handler-fn app-db query @dyn-vals)))]
;; handler-fn returns a reaction which is then wrapped in the sub reaction ;; handler-fn returns a reaction which is then wrapped in the sub reaction