SDK
/
toaster.do
2
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

completed basic gui functionalities linking to run and start

This commit is contained in:
Jaromil 2018-10-08 16:41:27 +02:00
parent 1e60140a6c
commit fe944519ac
5 changed files with 197 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
clojure_frontend/resources/public/static/css/toaster.css
View File

@ -56,6 +56,7 @@ table.sortable thead {
table.sortable td { table.sortable td {
font-size: .8em; font-size: .8em;
font-family: "arial" font-family: "arial"
vertical-align: middle;
} }
.input-form { .input-form {

36
clojure_frontend/src/toaster/handler.clj
View File

@ -48,16 +48,19 @@
(defroutes (defroutes
app-routes app-routes
(GET "/" request (web/render "Hello World!")) ;; web/readme)) (GET "/" request (web/render "Hello there!")) ;; web/readme))
;; NEW ROUTES HERE ;; NEW ROUTES HERE
(GET "/upload" request (GET "/upload" request
(->> (fn [req conf acct] (->> (fn [req conf acct]
(web/render acct views/dockerfile-upload-form)) (web/render acct [:div
views/dockerfile-upload-form
(views/list-jobs acct)]))
(s/check request))) (s/check request)))
(POST "/dockerfile" request (POST "/dockerfile" request
(->> views/dockerfile-upload-post (->> (fn [req conf acct]
(web/render acct (views/dockerfile-upload-post req conf acct)))
(s/check request))) (s/check request)))
(GET "/edit" request (GET "/edit" request
@ -66,7 +69,30 @@
(s/check request))) (s/check request)))
(GET "/list" request (GET "/list" request
(->> views/list-jobs (->> (fn [req conf acct]
(web/render acct (views/list-jobs acct)))
(s/check request)))
(POST "/remove" request
(->> (fn [req conf acct]
(web/render acct (views/remove-job req conf acct)))
(s/check request)))
(POST "/start" request
(->> (fn [req conf acct]
(web/render acct (views/start-job req conf acct)))
(s/check request)))
(POST "/view" request
(->> (fn [req conf acct]
(web/render acct (views/view-job req conf acct)))
(s/check request)))
(GET "/error" request
(->> (fn [req conf acct]
(web/render acct [:div
(web/render-error "Generic Error Page")
(views/list-jobs acct)]))
(s/check request))) (s/check request)))
;; JUST-AUTH ROUTES ;; JUST-AUTH ROUTES
@ -90,7 +116,7 @@
(let [session {:session {:config config (let [session {:session {:config config
:auth logged}}] :auth logged}}]
(conj session (conj session
(views/list-jobs request config logged))) (web/render logged (views/list-jobs logged))))
;; (web/render ;; (web/render
;; logged ;; logged
;; [:div ;; [:div

31
clojure_frontend/src/toaster/jobs.clj
View File

@ -46,26 +46,35 @@
r_mkdir (ssh "-i" (q config [:jenkins :key]) r_mkdir (ssh "-i" (q config [:jenkins :key])
(ssh-host config) "mkdir" "-p" jobdir) (ssh-host config) "mkdir" "-p" jobdir)
r_scp (scp "-i" (q config [:jenkins :key]) r_scp (scp "-i" (q config [:jenkins :key])
path (str (ssh-host config) ":" jobdir)) path (str (ssh-host config) ":" jobdir "/Dockerfile"))
r_job (log/spy (sync_jobs config "-a" jobname)) r_job (sync_jobs config "-a" jobname)
r_store (log/spy (db/store! r_store (db/store! @jobs :jobid
@jobs :jobid {:jobid jobname
(log/spy {:jobid jobname
:email (:email account) :email (:email account)
:account (dissoc account :password :activation-link) :account (dissoc account :password :activation-link)
:lint (if (.contains r_lint "is OK") true false) :lint (if (.contains r_lint "is OK") true false)
:timestamp tstamp :timestamp tstamp
:type "vm_amd64"})))] :type "vm_amd64"
:dockerfile (slurp path)})]
{:lint r_lint {:lint r_lint
:job r_job} :job r_job}
(f/when-failed [e] (f/when-failed [e]
(web/render-error-page (web/render-error
(str "Job add failure: " (f/message e)))))))) (str "Job add failure: " (f/message e))))))))
(defn trash [jobid config]
(f/attempt-all [r_sync (sync_jobs config "-d" jobid)]
jobid
(f/when-failed [e]
(web/render-error
(str "Job remove failure: " (f/message e))))))
(defn start [jobid config]
(f/attempt-all [r_sync (sync_jobs config "-r" jobid)]
jobid
(f/when-failed [e]
(web/render-error
(str "Job start failure: " (f/message e))))))
(defn listall [config account]
(sync_jobs config "-l" (:email account))
;;(db/query @jobs {:email (:email account)})
)

81
clojure_frontend/src/toaster/views.clj
View File

@ -16,6 +16,7 @@
[clj-time.core :as time] [clj-time.core :as time]
[clj-time.coerce :as tc] [clj-time.coerce :as tc]
[clj-time.local :as tl] [clj-time.local :as tl]
[clj-storage.core :as db]
[hiccup.form :as hf])) [hiccup.form :as hf]))
(def dockerfile-upload-form (def dockerfile-upload-form
@ -43,7 +44,7 @@ proceed to validation."]
:enctype "multipart/form-data"} :enctype "multipart/form-data"}
[:fieldset {:class "fieldset btn btn-default btn-file btn-lg"} [:fieldset {:class "fieldset btn btn-default btn-file btn-lg"}
[:textarea {:name "editor" :id "editor" [:textarea {:name "editor" :id "editor"
:rows 30 :cols 72 } "FROM: dyne/devuan:ascii"] :rows 30 :cols 72} "FROM: dyne/devuan:ascii"]
[:input {:class "btn btn-primary btn-lg" [:input {:class "btn btn-primary btn-lg"
:id "field-submit" :type "submit" :id "field-submit" :type "submit"
:name "submit" :value "submit"}]]]] :name "submit" :value "submit"}]]]]
@ -60,8 +61,6 @@ proceed to validation."]
[:div {:class "row"} [:a {:href "/upload"} "Upload a new toaster job"]]]]) [:div {:class "row"} [:a {:href "/upload"} "Upload a new toaster job"]]]])
(defn dockerfile-upload-post [request config account] (defn dockerfile-upload-post [request config account]
(web/render
account
(let (let
[tempfile (get-in request [:params :file :tempfile]) [tempfile (get-in request [:params :file :tempfile])
filename (get-in request [:params :file :filename]) filename (get-in request [:params :file :filename])
@ -70,44 +69,80 @@ proceed to validation."]
(> (get-in params [:file :size]) 64000) (> (get-in params [:file :size]) 64000)
;; max upload size in bytes ;; max upload size in bytes
;; TODO: put in config ;; TODO: put in config
(web/render-error-page params "File too big in upload (64KB limit).") (web/render-error params "File too big in upload (64KB limit).")
:else :else
(let [file (io/copy tempfile (io/file "/tmp" filename)) (let [file (io/copy tempfile (io/file "/tmp" filename))
path (str "/tmp/" filename)] path (str "/tmp/" filename)]
(io/delete-file tempfile) (io/delete-file tempfile)
(if (not (.exists (io/file path))) (if (not (.exists (io/file path)))
(web/render-error-page (web/render-error
(log/spy :error (log/spy :error
[:h1 (str "Uploaded file not found: " filename)])) [:h1 (str "Uploaded file not found: " filename)]))
;; file is now in 'tmp' var ;; file is now in 'tmp' var
[:div {:class "container-fluid"} [:div {:class "container-fluid"}
[:h1 "Job uploaded and added"] [:h1 "Job uploaded and added"]
[:p "Log messages:"] [:p "Log messages:"]
(web/render-yaml (job/add path config account))])))))) (web/render-yaml (job/add path config account))])))))
(defn list-jobs [request config account] (defn list-jobs [account]
(f/attempt-all (f/attempt-all
[joblist (job/listall config account)] [joblist (db/query @ring/jobs {:email (:email account)})]
(web/render
account
[:div {:class "container-fluid"} [:div {:class "container-fluid"}
[:h1 (str "List all toaster jobs for " (:name account))] [:h1 (str "List all toaster jobs for " (:name account))]
[:table {:class "sortable table"} [:table {:class "sortable table"}
[:thead nil [:thead nil
[:tr nil [:th nil "Date"] [:th nil "Type"] [:th nil "Actions"]]] [:tr nil [:th nil "Date"] [:th nil "Type"] [:th nil "Status"] [:th nil "Actions"]]]
[:tbody nil [:tbody nil
(for [j joblist] (for [j joblist]
(let [type (-> j (str/split #"-") second) (let [type (:type j) ;; (-> j (str/split #"-") second)
tstamp (-> j (str/split #"-") last)] tstamp (:timestamp j) ;; (-> j (str/split #"-") last)
jobid (:jobid j)
joburl (str/replace jobid #"@" "AT")]
[:tr nil [:tr nil
[:td {:class "date"} (-> tstamp Long/valueOf tc/from-long tl/to-local-date-time [:td {:class "date"} (-> tstamp Long/valueOf tc/from-long humanize/datetime)]
humanize/datetime)] [:td {:class "job"} [:a {:href (str "https://sdk.dyne.org:4443/view/web-sdk-builds/job/" joburl)} type]]
[:td {:class "job"} [:a {:href (str "https://sdk.dyne.org:4443/view/web-sdk-builds/job/" [:td {:class "status"} [:a {:href (str "https://sdk.dyne.org:4443/job/" joburl "/lastBuild/console")}
(str/replace j #"@" "AT"))} type]] [:img {:src (str "https://sdk.dyne.org:4443/job/" joburl "/badge/icon")}]]]
[:td {:class "start-job"} (web/button "/start" "Start" (hf/hidden-field "job" j)) [:td {:class "actions"}
(web/button "/remove" "Remove" (hf/hidden-field "job" j))]] [:div {:class "btn-toolbar" :role "toolbar" :arial-label "Actions"}
))]]]) (web/button "/view" "\uD83D\uDC41" (hf/hidden-field "jobid" jobid))
(web/button "/start" "▶" (hf/hidden-field "jobid" jobid))
(web/button "/remove" "\uD83D\uDDD1" (hf/hidden-field "jobid" jobid))]]]
))]]]
(f/when-failed [e] (f/when-failed [e]
(web/render-error-page (web/render-error
(str "Job list failure: " (f/message e)))) (str "Job list failure: " (f/message e))))))
))
(defn remove-job [request config account]
(f/attempt-all
[jobid (s/param request :jobid)
jobfound (db/query @ring/jobs {:jobid jobid})
r_rmjob (db/delete! @ring/jobs jobid)
r_sync (job/trash jobid config)]
[:h1 (str "Job removed: " jobid)]
(f/when-failed [e]
(web/render-error (str "Failure removing job: " (f/message e))))))
(defn start-job [request config account]
(f/attempt-all
[jobid (s/param request :jobid)
jobfound (db/query @ring/jobs {:jobid jobid})
r_sync (job/start jobid config)]
[:div {:class "container-fluid"}
[:h1 (str "Job started: " jobid)]
[:p [:a {:href (str "https://sdk.dyne.org:4443/view/web-sdk-builds/job/"
(str/replace jobid #"@" "AT"))}]]]
(f/when-failed [e]
(web/render-error (str "Failure starting job: " (f/message e))))))
(defn view-job [request config account]
(f/attempt-all
[jobid (s/param request :jobid)
jobfound (db/fetch @ring/jobs jobid)
dockerfile (log/spy (-> jobfound :dockerfile))]
(web/render account [:div
[:h1 (str "Viewing job: " jobid)]
[:pre dockerfile]])
(f/when-failed [e]
(web/render-error (str "Failure viewing job: " (f/message e))))))

8
clojure_frontend/src/toaster/webpage.clj
View File

@ -98,6 +98,14 @@
[:div {:class "container-fluid"} body] [:div {:class "container-fluid"} body]
(render-footer)])})) (render-footer)])}))
(defn render-success
"render a successful message without ending the page"
[succ]
[:div {:class "alert alert-success" :role "alert"}
[:span {:class "far fa-check-circle"
:aria-hidden "true" :style "padding: .5em"}]
[:span {:class "sr-only"} "Success:" ]
succ])
(defn render-error (defn render-error
"render an error message without ending the page" "render an error message without ending the page"