diff --git a/src/day8/re_frame/trace/subs.cljs b/src/day8/re_frame/trace/subs.cljs index 77886c4..eb2b30c 100644 --- a/src/day8/re_frame/trace/subs.cljs +++ b/src/day8/re_frame/trace/subs.cljs @@ -255,7 +255,7 @@ :<- [:traces/current-event-traces] (fn [traces] (let [start-of-render (first (filter metam/request-animation-frame? traces)) - end-of-epoch (utils/last-in-vec traces)] + end-of-epoch (utils/last-in-vec traces)] (metam/elapsed-time start-of-render end-of-epoch)))) (rf/reg-sub @@ -302,31 +302,29 @@ :<- [:subs/all-sub-traces] :<- [:app-db/reagent-id] (fn [[traces app-db-id]] - (js/console.log "appdb id" app-db-id) - (let [raw (map (fn [trace] (let [pod-type (sub-op-type->type trace) - path-str (pr-str (get-in trace [:tags :query-v])) - layer (if (some #(= app-db-id %) (get-in trace [:tags :input-signals])) - 2 - 3)] - {:id (str pod-type (get-in trace [:tags :reaction])) - :type pod-type - :layer layer - :path path-str - :value (get-in trace [:tags :value]) + (let [raw (map (fn [trace] (let [pod-type (sub-op-type->type trace) + path-str (pr-str (get-in trace [:tags :query-v])) + layer (if (some #(= app-db-id %) (get-in trace [:tags :input-signals])) + 2 + 3)] + {:id (str pod-type (get-in trace [:tags :reaction])) + :type pod-type + :layer layer + :path path-str + :value (get-in trace [:tags :value]) - ;; TODO: data for sub - ;; TODO: get layer level - ;; TODO: Get not run subscriptions - })) - traces) + ;; TODO: Get not run subscriptions + })) + traces) ;; Filter out run if it was created ;; Group together run time + run-multiple? (into {} + (filter (fn [[k v]] (< 1 v))) + (frequencies (map :id raw))) - run-multiple? (frequencies (map :id raw))] - (js/console.log "Run Multiple" run-multiple?) - (js/console.log "Traces" traces) - (js/console.log "Raw" raw) + raw (map (fn [sub] (assoc sub :run-times (get run-multiple? (:id sub)))) raw)] + (js/console.log raw) (sort-by identity subscription-comparator raw)))) (rf/reg-sub diff --git a/src/day8/re_frame/trace/view/subs.cljs b/src/day8/re_frame/trace/view/subs.cljs index da5d7cd..501fb7b 100644 --- a/src/day8/re_frame/trace/view/subs.cljs +++ b/src/day8/re_frame/trace/view/subs.cljs @@ -119,7 +119,7 @@ :style {:margin-top "6px"} :on-change #(rf/dispatch [:subs/ignore-unchanged-subs? %])]]]]])) -(defn pod-header [{:keys [id type layer path open? diff?]}] +(defn pod-header [{:keys [id type layer path open? diff? run-times]}] [rc/h-box :class "app-db-path--header" :style (merge {:border-top-left-radius "3px" @@ -142,6 +142,8 @@ [rc/box :width "64px" ;; (100-36)px from box above :child [tag type (short-tag-desc type)]] + (when run-times + [:span "Warning: run " run-times " times"]) [rc/h-box :size "auto" :class "app-db-path--path-header"