specs, again!

neo4j-4
Josha von Gizycki 5 years ago
parent d3efb3165e
commit 8937d28346

@ -1,7 +1,19 @@
(ns wanijo.visualisation.domain (ns wanijo.visualisation.domain
(:require [wanijo.framework.neo4j :as neo4j] (:require [clojure.spec.alpha :as spec]
[wanijo.framework.neo4j :as neo4j]
[wanijo.instance.domain :as domain-instance])) [wanijo.instance.domain :as domain-instance]))
(spec/def ::link-name
(spec/or :not-give nil?
:given string?))
(spec/def ::links-out
(spec/coll-of
(spec/merge ::domain-instance/instance
(spec/keys :req-un [::link-name]))))
(spec/def ::with-enriched-out-links
(spec/merge ::domain-instance/instance
(spec/keys :req-un [::links-out])))
(neo4j/defquery all-instance-connections (neo4j/defquery all-instance-connections
"MATCH "MATCH
(source:instance)-[:of]->(schema:schema) (source:instance)-[:of]->(schema:schema)
@ -28,9 +40,11 @@
(-> % :label :name)) (-> % :label :name))
links-in)))) links-in))))
(defn search! [term] (defn search! [term]
{:post [(spec/assert (spec/coll-of ::with-enriched-out-links) %)]}
(->> (neo4j/exec-query! search {:term (str ".*" term ".*")}) (->> (neo4j/exec-query! search {:term (str ".*" term ".*")})
(map #(domain-instance/full-instance-by-uuid! (-> % :i :uuid))) (map #(domain-instance/full-instance-by-uuid! (-> % :i :uuid)))
(map enrich-links))) (map enrich-links)))
(defn instance! [uuid] (defn instance! [uuid]
{:post [(spec/assert ::with-enriched-out-links %)]}
(enrich-links (domain-instance/full-instance-by-uuid! uuid))) (enrich-links (domain-instance/full-instance-by-uuid! uuid)))

@ -35,7 +35,8 @@
(defroutes routes (defroutes routes
(GET (register! :vis-explore "/vis/explore/:instance-uuid") (GET (register! :vis-explore "/vis/explore/:instance-uuid")
[instance-uuid :as req] [instance-uuid :as req]
(vis-view/index instance-uuid req)) (vis-view/index (domain-instance/find-by-uuid! instance-uuid)
req))
(GET (register! :vis-all-instances "/vis/all-instances") (GET (register! :vis-all-instances "/vis/all-instances")
[:as req] [:as req]
(all-instances req)) (all-instances req))

@ -1,22 +1,22 @@
(ns wanijo.visualisation.view (ns wanijo.visualisation.view
(:require [hiccup.page :refer [include-js include-css]] (:require [hiccup.page :refer [include-js include-css]]
[hiccup.form :as hform] [hiccup.form :as hform]
[hiccup.core :refer [h]]
[wanijo.framework.routing :refer [path]] [wanijo.framework.routing :refer [path]]
[wanijo.framework.view :as view])) [wanijo.framework.view :as view]))
(defn index [instance-uuid req] (defn index [instance req]
(view/layout! (view/layout!
:request req :request req
:head (list (include-css "/css/vis-network.min.css") :head (list (include-css "/css/vis-network.min.css")
(include-js "/js/vis-network.min.js" (include-js "/js/vis-network.min.js"
"/js/vis.js")) "/js/vis.js"))
:content :content
[[:h1 "Explore"] [[:h1 "Explore instance " [:small (h (:name instance))]]
[:form.search {:action (path :vis-search-instance {:term ""})} [:form.search {:action (path :vis-search-instance {:term ""})}
(hform/label "term" "Search Instance") (hform/label "term" "Search Instance")
(hform/text-field {:autofocus true} "term") (hform/text-field {:autofocus true} "term")
[:input {:style "display: none" :type "submit"}]] [:input {:style "display: none" :type "submit"}]]
[:div.vis-canvas {:data-instance-url (path :vis-get-instance [:div.vis-canvas {:data-instance-url (path :vis-get-instance instance)}]
{:uuid instance-uuid})}]
[:p.flash--warn [:p.flash--warn
"Changes to the visualisation will not (yet) mirror to the actual database"]])) "Changes to the visualisation will not (yet) mirror to the actual database"]]))

Loading…
Cancel
Save