From cae1ffd760f1cd59ccd58d84f839bbb812a17401 Mon Sep 17 00:00:00 2001
From: Josha von Gizycki <josha.von.gizycki@triology.de>
Date: Mon, 25 Mar 2019 10:26:48 +0100
Subject: [PATCH] some restructuring around vis and explore

---
 src/wanijo/framework/view.clj       | 2 --
 src/wanijo/instance/view.clj        | 4 ++--
 src/wanijo/visualisation/routes.clj | 6 +++---
 src/wanijo/visualisation/viz.clj    | 4 ++--
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/wanijo/framework/view.clj b/src/wanijo/framework/view.clj
index 3d2a5a9..522ad00 100644
--- a/src/wanijo/framework/view.clj
+++ b/src/wanijo/framework/view.clj
@@ -79,8 +79,6 @@
            [:section
             [:h2 [:span.__icon "▤"] "Visualisation"]
             [:ul
-             [:li [:a {:href (path :vis-index)}
-                   "Custom Visualisation"]]
              [:li [:a {:href (path :vis-all-instances)}
                    "All Instances"]]]]))]
        (into [:main
diff --git a/src/wanijo/instance/view.clj b/src/wanijo/instance/view.clj
index 8766c9a..503ef82 100644
--- a/src/wanijo/instance/view.clj
+++ b/src/wanijo/instance/view.clj
@@ -55,8 +55,8 @@
          [:a {:href (path :instance-edit-form instance)}
           "Edit Instance"]
          " | "
-         [:a {:href (path :vis-index)}
-          "Start visualisation"]]]
+         [:a {:href (path :vis-explore {:instance-uuid (:uuid instance)})}
+          "Explore from here"]]]
     (when (seq (:properties instance))
       [:section.properties
        [:h2 "Properties"]
diff --git a/src/wanijo/visualisation/routes.clj b/src/wanijo/visualisation/routes.clj
index 6e8dae7..df4b09d 100644
--- a/src/wanijo/visualisation/routes.clj
+++ b/src/wanijo/visualisation/routes.clj
@@ -23,12 +23,12 @@
    :body (domain-schema/accessible-schemas! (-> req :session :uuid))})
 
 (defroutes routes
-  (GET (register! :vis-index "/visualisation/index")
+  (GET (register! :vis-explore "/vis/explore/:instance-uuid")
        [:as req]
        (vis-view/index req))
-  (GET (register! :vis-all-instances "/visualisation/all-instances")
+  (GET (register! :vis-all-instances "/vis/all-instances")
        [:as req]
        (all-instances req))
-  (GET (register! :vis-all-schemas "/api/visualisation/schemas")
+  (GET (register! :vis-all-schemas "/api/vis/schemas")
        [:as req]
        (all-schemas req)))
diff --git a/src/wanijo/visualisation/viz.clj b/src/wanijo/visualisation/viz.clj
index 1945c19..3990ad2 100644
--- a/src/wanijo/visualisation/viz.clj
+++ b/src/wanijo/visualisation/viz.clj
@@ -29,8 +29,8 @@
                                 [(:uuid source) :> (:uuid instance)
                                  {:label (:name link)}])
                               (:links-in instance))
-        rankdir (if (or (> (count in-nodes) 7)
-                        (> (count out-nodes) 7))
+        rankdir (if (or (> (count in-nodes) 5)
+                        (> (count out-nodes) 5))
                   "LR"
                   "TD")]
     (-> [{:rankdir rankdir}