Rewrite filter function wip

This commit is contained in:
Saskia Lindner 2017-08-01 23:45:41 +02:00
parent 8ef8b9f5dc
commit 0ab1aa6e0a
1 changed files with 30 additions and 14 deletions

View File

@ -136,10 +136,33 @@
(reset! val "")) (reset! val ""))
nil)}]))) nil)}])))
(defn render-traces [padding slower-than-bold-int showing-traces] (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 render-traces [showing-traces]
(doall (doall
(for [{:keys [op-type id operation tags duration] :as trace} showing-traces] (for [{:keys [op-type id operation tags duration] :as trace} showing-traces]
(let [row-style (merge padding {:border-top (case op-type :event "1px solid lightgrey" nil)}) (let [padding {:padding "0px 5px 0px 5px"}
row-style (merge padding {:border-top (case op-type :event "1px solid lightgrey" nil)})
#_#__ (js/console.log (devtools/header-api-call tags))] #_#__ (js/console.log (devtools/header-api-call tags))]
(list [:tr {:key id (list [:tr {:key id
@ -157,6 +180,7 @@
"bold" "bold"
"") "")
:white-space "nowrap"})} :white-space "nowrap"})}
(.toFixed duration 1) " ms"]] (.toFixed duration 1) " ms"]]
(when true (when true
[:tr {:key (str id "-details")} [:tr {:key (str id "-details")}
@ -168,19 +192,11 @@
(defn render-trace-panel [] (defn render-trace-panel []
(let [filter-input (r/atom "") (let [filter-input (r/atom "")
filter-items (r/atom []) filter-items (r/atom [])
slower-than-ms (r/atom "")
slower-than-bold (r/atom "")
filter-type (r/atom "contains")] filter-type (r/atom "contains")]
(fn [] (fn []
(let [slower-than-ms-int (js/parseInt @slower-than-ms) (let [showing-traces (if (= @filter-items [])
slower-than-bold-int (js/parseInt @slower-than-bold) @traces
op-filter (when-not (str/blank? @filter-input) (run-all-filters @traces @filter-items))
(filter #(str/includes? (str/lower-case (str (:operation %) " " (:op-type %))) @filter-input)))
ms-filter (when-not (str/blank? @slower-than-ms)
(filter #(< slower-than-ms-int (:duration %))))
transducers (apply comp (remove nil? [ms-filter op-filter]))
showing-traces (sequence transducers @traces)
padding {:padding "0px 5px 0px 5px"}
save-query (fn [_] save-query (fn [_]
(swap! filter-items conj {:id (random-uuid) (swap! filter-items conj {:id (random-uuid)
:query (str/lower-case @filter-input) :query (str/lower-case @filter-input)
@ -225,7 +241,7 @@
(when (pos? (count @traces)) (when (pos? (count @traces))
[:span "(" [:button.text-button {:on-click #(do (trace/reset-tracing!) (reset! traces []))} "clear"] ")"])] [:span "(" [:button.text-button {:on-click #(do (trace/reset-tracing!) (reset! traces []))} "clear"] ")"])]
[:th "meta"]] [:th "meta"]]
[:tbody (render-traces padding slower-than-bold-int showing-traces)]]])))) [:tbody (render-traces showing-traces)]]]))))
(defn resizer-style [draggable-area] (defn resizer-style [draggable-area]
{:position "absolute" :z-index 2 :opacity 0 {:position "absolute" :z-index 2 :opacity 0