Skip to content

Commit

Permalink
use updated defc macro in UI
Browse files Browse the repository at this point in the history
  • Loading branch information
@thheller
thheller committed Aug 18, 2020
1 parent 8583aa4 commit fcf0f48
Show file tree
Hide file tree
Showing 8 changed files with 659 additions and 587 deletions.
253 changes: 130 additions & 123 deletions src/main/shadow/cljs/ui/components/builds.cljs
View file
Expand Up @@ -62,140 +62,147 @@
[:path {:d "M12 22a10 10 0 1 1 0-20 10 10 0 0 1 0 20zm0-2a8 8 0 1 0 0-16 8 8 0 0 0 0 16zm0-9a1 1 0 0 1 1 1v4a1 1 0 0 1-2 0v-4a1 1 0 0 1 1-1zm0-4a1 1 0 1 1 0 2 1 1 0 0 1 0-2z"}]]))

(defc ui-builds-entry [build-ident]
[{::m/keys [build-id build-worker-active build-warnings-count build-status] :as data}
(sg/query-ident build-ident
[::m/build-id
::m/build-worker-active
::m/build-warnings-count
{::m/build-status
[:status]}])]
(let [{:keys [status]} build-status]
(<< [:div.border-b.bg-white.p-4.flex
[:div.self-center.pr-4
[:a.cursor-pointer {:href (str "/build/" (name build-id))}
(case status
:compiling
icon-build-busy

:completed
(if (zero? build-warnings-count)
icon-build-success
icon-build-warnings)

:failed
icon-build-error

:inactive
icon-build-missing

:pending
icon-build-busy

icon-build-missing)]]
[:div.flex-1
[:div.pb-1
[:a.font-bold.text-lg {:href (str "/build/" (name build-id))} (name build-id)]]
[:div
(build-buttons build-id build-worker-active)
]]])))
(bind {::m/keys [build-id build-worker-active build-warnings-count build-status] :as data}
(sg/query-ident build-ident
[::m/build-id
::m/build-worker-active
::m/build-warnings-count
{::m/build-status
[:status]}]))

(render
(let [{:keys [status]} build-status]
(<< [:div.border-b.bg-white.p-4.flex
[:div.self-center.pr-4
[:a.cursor-pointer {:href (str "/build/" (name build-id))}
(case status
:compiling
icon-build-busy

:completed
(if (zero? build-warnings-count)
icon-build-success
icon-build-warnings)

:failed
icon-build-error

:inactive
icon-build-missing

:pending
icon-build-busy

icon-build-missing)]]
[:div.flex-1
[:div.pb-1
[:a.font-bold.text-lg {:href (str "/build/" (name build-id))} (name build-id)]]
[:div
(build-buttons build-id build-worker-active)
]]]))))

(defc ui-builds-page []
[{::m/keys [builds]}
(sg/query-root [::m/builds])
(bind {::m/keys [builds]}
(sg/query-root [::m/builds]))

::m/build-watch-compile! sg/tx
::m/build-watch-start! sg/tx
::m/build-watch-stop! sg/tx
::m/build-compile! sg/tx
::m/build-release! sg/tx
::m/build-release-debug! sg/tx]
(event ::m/build-watch-compile! sg/tx)
(event ::m/build-watch-start! sg/tx)
(event ::m/build-watch-stop! sg/tx)
(event ::m/build-compile! sg/tx)
(event ::m/build-release! sg/tx)
(event ::m/build-release-debug! sg/tx)

(<< [:div.flex-1.overflow-auto.pt-2.bg-white
;; [:div.p-4.px-8 "start all / stop all"]
(sg/render-seq builds identity ui-builds-entry)]))
(render
(<< [:div.flex-1.overflow-auto.pt-2.bg-white
;; [:div.p-4.px-8 "start all / stop all"]
(sg/render-seq builds identity ui-builds-entry)])))

(defc ui-build-overview [build-ident]
[{::m/keys [build-sources-sorted] :as data}
(sg/query-ident build-ident
[::m/build-sources-sorted])

state-ref (atom {:selected nil})

selected (sg/watch state-ref [:selected])

id->src
(into {} (map (juxt :resource-id identity)) build-sources-sorted)

id->idx
(reduce-kv
(fn [m idx {:keys [resource-id] :as v}]
(assoc m resource-id idx))
{}
build-sources-sorted)

::highlight
(fn [env e resource-id]
(swap! state-ref assoc :selected resource-id))

render-source-entry
(fn [{:keys [resource-id resource-name] :as item}]
(let [selected? (= resource-id selected)]
(<< [:div.text-xs
{:class (when selected? "font-bold")
:on-mouseenter [::highlight resource-id]}
resource-name])))]

(<< [:div.p-2
[:div.py-2.text-xl (count build-sources-sorted) " Namespaces used in build"]
[:div.flex
[:div.flex-1 "left"]
[:div
(sg/render-seq build-sources-sorted nil render-source-entry)]
[:div.flex-1 "right"]]]))
(bind {::m/keys [build-sources-sorted] :as data}
(sg/query-ident build-ident
[::m/build-sources-sorted]))

(bind state-ref
(atom {:selected nil}))

(bind selected
(sg/watch state-ref [:selected]))

(bind id->src
(into {} (map (juxt :resource-id identity)) build-sources-sorted))

(bind id->idx
(reduce-kv
(fn [m idx {:keys [resource-id] :as v}]
(assoc m resource-id idx))
{}
build-sources-sorted))

(event ::highlight [env e resource-id]
(swap! state-ref assoc :selected resource-id))

(bind render-source-entry
(fn [{:keys [resource-id resource-name] :as item}]
(let [selected? (= resource-id selected)]
(<< [:div.text-xs
{:class (when selected? "font-bold")
:on-mouseenter [::highlight resource-id]}
resource-name]))))

(render
(<< [:div.p-2
[:div.py-2.text-xl (count build-sources-sorted) " Namespaces used in build"]
[:div.flex
[:div.flex-1 "left"]
[:div
(sg/render-seq build-sources-sorted nil render-source-entry)]
[:div.flex-1 "right"]]])))

(defc ui-build-runtimes [build-ident]
[{::m/keys [build-runtimes] :as data}
(sg/query-ident build-ident
[::m/build-runtimes])]
(bind {::m/keys [build-runtimes] :as data}
(sg/query-ident build-ident
[::m/build-runtimes]))

(let [runtime-count (count build-runtimes)]
(<< [:div.px-2
[:div.pt-2
(condp = runtime-count
0 "No connected runtimes."
1 "1 connected runtime:"
(str runtime-count " connected runtimes:"))]
(render
(let [runtime-count (count build-runtimes)]
(<< [:div.px-2
[:div.pt-2
(condp = runtime-count
0 "No connected runtimes."
1 "1 connected runtime:"
(str runtime-count " connected runtimes:"))]

(runtimes/ui-runtime-listing build-runtimes)])))
(runtimes/ui-runtime-listing build-runtimes)]))))

(defc ui-build-page [build-ident]
[data
(sg/query-ident build-ident
[:db/ident
::m/build-id
::m/build-target
::m/build-worker-active
::m/build-status])

::m/build-watch-compile! sg/tx
::m/build-watch-start! sg/tx
::m/build-watch-stop! sg/tx
::m/build-compile! sg/tx
::m/build-release! sg/tx
::m/build-release-debug! sg/tx]

(let [{::m/keys [build-id build-target build-status build-worker-active]} data]
(<< [:div
[:div.px-2
[:h1.text-xl.pt-4 (name build-id)]
[:div " target: " (name build-target)]]
[:div.p-2 (build-buttons build-id build-worker-active)]]

(when build-worker-active
(ui-build-runtimes build-ident))

(build-status/render-build-status-full build-status)

)))
(bind data
(sg/query-ident build-ident
[:db/ident
::m/build-id
::m/build-target
::m/build-worker-active
::m/build-status]))

(event ::m/build-watch-compile! sg/tx)
(event ::m/build-watch-start! sg/tx)
(event ::m/build-watch-stop! sg/tx)
(event ::m/build-compile! sg/tx)
(event ::m/build-release! sg/tx)
(event ::m/build-release-debug! sg/tx)

(render
(let [{::m/keys [build-id build-target build-status build-worker-active]} data]
(<< [:div
[:div.px-2
[:h1.text-xl.pt-4 (name build-id)]
[:div " target: " (name build-target)]]
[:div.p-2 (build-buttons build-id build-worker-active)]]

(when build-worker-active
(ui-build-runtimes build-ident))

(build-status/render-build-status-full build-status)

))))


102 changes: 53 additions & 49 deletions src/main/shadow/cljs/ui/components/dashboard.cljs
View file
Expand Up @@ -5,67 +5,71 @@
[shadow.cljs.ui.components.build-status :as build-status]))

(defc ui-http-servers []
[{::m/keys [http-servers]}
(sg/query-root
[{::m/http-servers
[::m/http-server-id
::m/http-url
::m/https-url
::m/http-config]}])]
(bind {::m/keys [http-servers]}
(sg/query-root
[{::m/http-servers
[::m/http-server-id
::m/http-url
::m/https-url
::m/http-config]}]))

(<< [:div.m-4.rounded.border.shadow.bg-white
[:div.p-2.font-bold.border-b "HTTP Servers"]
[:ol.pl-6.pt-1.list-disc
(sg/render-seq http-servers ::m/http-server-id
(fn [{::m/keys [http-url https-url http-config]}]
(let [url (or http-url https-url)
display-name (:display-name http-config)]
(<< [:li.pb-1
[:a.font-bold {:href url :target "_blank"} url]
" - "
(when (seq display-name)
(str display-name " - "))
(pr-str (:roots http-config))]))))]]))
(render
(<< [:div.m-4.rounded.border.shadow.bg-white
[:div.p-2.font-bold.border-b "HTTP Servers"]
[:ol.pl-6.pt-1.list-disc
(sg/render-seq http-servers ::m/http-server-id
(fn [{::m/keys [http-url https-url http-config]}]
(let [url (or http-url https-url)
display-name (:display-name http-config)]
(<< [:li.pb-1
[:a.font-bold {:href url :target "_blank"} url]
" - "
(when (seq display-name)
(str display-name " - "))
(pr-str (:roots http-config))]))))]])))

(defc ui-active-build [ident]
[{::m/keys [build-status build-id build-target] :as data}
(sg/query-ident ident
[::m/build-id
::m/build-target
::m/build-status
::m/build-config-raw])]
(bind {::m/keys [build-status build-id build-target] :as data}
(sg/query-ident ident
[::m/build-id
::m/build-target
::m/build-status
::m/build-config-raw]))

(<< [:div.p-2
[:div.text-xl
[:a {:href (str "/build/" (name build-id))}
(name build-id) " - " (name build-target)]]
(render
(<< [:div.p-2
[:div.text-xl
[:a {:href (str "/build/" (name build-id))}
(name build-id) " - " (name build-target)]]

(build-status/render-build-status-short build-status)]))
(build-status/render-build-status-short build-status)])))

(defc ui-active-builds []
[{::m/keys [active-builds]}
(sg/query-root [::m/active-builds])]
(bind {::m/keys [active-builds]}
(sg/query-root [::m/active-builds]))

(<< [:div.m-4.rounded.border.shadow.bg-white
[:div.p-2.font-bold.border-b "Active Builds"]
(render
(<< [:div.m-4.rounded.border.shadow.bg-white
[:div.p-2.font-bold.border-b "Active Builds"]

(sg/render-seq active-builds identity ui-active-build)]
))
(sg/render-seq active-builds identity ui-active-build)]
)))

(defc ui-active-runtimes []
[{::m/keys [runtimes-sorted]}
(sg/query-root
[{::m/runtimes-sorted
[:runtime-id
:runtime-info
:supported-ops]}])]
(bind {::m/keys [runtimes-sorted]}
(sg/query-root
[{::m/runtimes-sorted
[:runtime-id
:runtime-info
:supported-ops]}]))

(<< [:div.m-4.rounded.border.shadow.bg-white
[:div.p-2.font-bold.border-b "Active Runtimes"]
[:ol.pl-6.pt-1.list-disc
(sg/render-seq runtimes-sorted :runtime-id
(fn [runtime]
(<< [:li (pr-str runtime)])))]]))
(render
(<< [:div.m-4.rounded.border.shadow.bg-white
[:div.p-2.font-bold.border-b "Active Runtimes"]
[:ol.pl-6.pt-1.list-disc
(sg/render-seq runtimes-sorted :runtime-id
(fn [runtime]
(<< [:li (pr-str runtime)])))]])))

(defn ui-page []
(<< [:div.flex-1.overflow-auto
Expand Down

0 comments on commit fcf0f48

Please sign in to comment.