From 7ceb88e0c2c47c49fa0fdc685d7a1ae42686e42c Mon Sep 17 00:00:00 2001
From: Josha von Gizycki <josha@borbarad.localdomain>
Date: Sun, 30 Sep 2018 23:38:56 +0200
Subject: [PATCH] add joshavg/formulare, some cleanup on forms

---
 project.clj                  |  5 +++--
 src/wanijo/schema/routes.clj |  2 +-
 src/wanijo/schema/view.clj   | 16 +++++++++-------
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/project.clj b/project.clj
index bbfaaa0..5afa1a0 100644
--- a/project.clj
+++ b/project.clj
@@ -4,11 +4,12 @@
   :min-lein-version "2.0.0"
 
   :dependencies [[org.clojure/clojure "1.9.0"]
-                 
+
                  [compojure "1.6.1"]
                  [ring/ring-defaults "0.3.2"]
                  [hiccup "1.0.5"]
-                 
+                 [joshavg/formulare "0.2.1-SNAPSHOT"]
+
                  [gorillalabs/neo4j-clj "1.1.0"
                   :exclusions [org.bouncycastle/bcprov-jdk15on
                                org.bouncycastle/bcpkix-jdk15on
diff --git a/src/wanijo/schema/routes.clj b/src/wanijo/schema/routes.clj
index 3f7d505..c50d30f 100644
--- a/src/wanijo/schema/routes.clj
+++ b/src/wanijo/schema/routes.clj
@@ -1,8 +1,8 @@
 (ns wanijo.schema.routes
   (:require [compojure.core :refer [defroutes GET POST DELETE]]
             [ring.util.response :as resp]
+            [formulare.core :as form]
             [wanijo.framework.view :as view]
-            [wanijo.framework.form :as form]
             [wanijo.framework.routing :refer [register! path]]
             [wanijo.schema.domain :as domain]
             [wanijo.user.domain :as domain-user]
diff --git a/src/wanijo/schema/view.clj b/src/wanijo/schema/view.clj
index 78d5f81..fec60e7 100644
--- a/src/wanijo/schema/view.clj
+++ b/src/wanijo/schema/view.clj
@@ -1,8 +1,8 @@
 (ns wanijo.schema.view
   (:require [hiccup.form :as hform]
             [ring.util.anti-forgery :refer [anti-forgery-field]]
+            [formulare.core :as form]
             [wanijo.framework.view :as view]
-            [wanijo.framework.form :as form]
             [wanijo.framework.routing :refer [path]]
             [wanijo.framework.time :refer [prettify-dt]]
             [wanijo.schema.domain :as domain]
@@ -11,7 +11,9 @@
 (def form
   {:fields {:name {:label "Name"
                    :required true
-                   :spec ::domain/name}}})
+                   :spec ::domain/name}
+            :uuid {:label ""
+                   :widget :hidden}}})
 
 (def attr-form
   {:fields {:name {:label "Name"
@@ -27,13 +29,16 @@
             :required {:label "Required"
                        :required false
                        :spec ::attr-domain/required
-                       :widget :checkbox}}})
+                       :widget :checkbox}
+            :uuid {:widget :hidden}}})
 
 (def assign-form
   {:fields {:assigned {:label "Users"
                        :required false
                        :spec ::domain/assigned-to
-                       :widget :mselect}}})
+                       :widget :mselect}
+            :uuid {:label ""
+                   :widget :hidden}}})
 
 (defn overview! [req]
   (let [session (:session req)
@@ -70,12 +75,10 @@
     [:h2 "Edit"]
     (hform/form-to [:post (path :schema-edit)]
                    (form/render-widgets form schema req)
-                   (hform/hidden-field "uuid" (:uuid schema))
                    (hform/submit-button "Edit"))
     [:h3 "Assign to users"]
     (hform/form-to [:post (path :schema-assign)]
                    (form/render-widgets assign-form schema req)
-                   (hform/hidden-field "uuid" (:uuid schema))
                    (hform/submit-button "Assign"))
     [:h2 "Attributes"]
     [:ul.schema-attributes
@@ -83,7 +86,6 @@
        [:li
         (hform/form-to [:post (path :attribute-edit {:schema (:uuid schema)})]
                        (form/render-widgets attr-form attr req)
-                       (hform/hidden-field "uuid" (:uuid attr))
                        (hform/submit-button "Save"))
         (hform/form-to [:delete (path :attribute-delete attr)]
                        (anti-forgery-field)