status-im
/
re-frame-10x
mirror of https://github.com/status-im/re-frame-10x.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Refactor filter function

This commit is contained in:
Saskia Lindner 2017-08-02 11:09:02 +02:00
parent 0ab1aa6e0a
commit 7b55f8d8fb
1 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/day8/re_frame/trace.cljs
View File

@ -136,27 +136,13 @@
(reset! val ""))
nil)}])))
(defn construct-string [trace]
(clojure.string/lower-case (str (:operation trace) " " (:op-type trace))))
(defn has-word [traces q]
(filter #(clojure.string/includes? (construct-string %) (:query q)) traces))
(defn has-duration [traces q]
(filter #(< (js/parseInt (:query q)) (:duration %)) traces))
(defn filter-by-word [traces queries]
(mapcat (partial has-word traces) queries))
(defn filter-by-duration [traces queries]
(mapcat (partial has-duration traces) queries))
(defn run-all-filters [traces queries]
(let [[word-queries duration-queries] (vals (group-by #(= (:filter-type %) "contains") queries))
traces-filtered-by-words (filter-by-word traces word-queries)]
(if duration-queries
(filter-by-duration traces-filtered-by-words duration-queries)
traces-filtered-by-words)))
(defn query->fn [query]
(if (= "contains" (:filter-type query))
(fn [trace]
(str/includes? (str/lower-case (str (:operation trace) " " (:op-type trace)))
(:query query)))
(fn [trace]
(< (js/parseInt (:query query)) (:duration trace)))))
(defn render-traces [showing-traces]
(doall
@ -196,10 +182,13 @@
(fn []
(let [showing-traces (if (= @filter-items [])
@traces
(run-all-filters @traces @filter-items))
(filter (apply every-pred (map query->fn @filter-items)) @traces))
save-query (fn [_]
(println @filter-type @filter-input)
(swap! filter-items conj {:id (random-uuid)
:query (str/lower-case @filter-input)
:query (if (= @filter-type "contains")
(str/lower-case @filter-input)
(js/parseInt @filter-input))
:filter-type @filter-type}))]
[:div
[:div.filter-control {:style {:margin-bottom 20}}