add markdown as attr type, fix write permissions check

src/wanijo/attribute/domain.clj

@@ -5,10 +5,11 @@
 (spec/def ::name
   (spec/and string? not-empty))
 
+(def types
+  #{"string" "date" "file" "markdown" "text"})
+
 (spec/def ::type
-  (spec/and
+  (spec/and string? types))
-   string?
-   #(some (partial = %) ["date" "file", "string" "text"])))
 
 (spec/def ::required
   #(some (partial = %) ["on" nil 0 1 "0" "1"]))

src/wanijo/attribute/routes.clj

@@ -12,8 +12,7 @@
   (let [schema-uuid (get-in req [:params :schema])]
     (if (form/valid? view-schema/attr-form req)
       (do
-        (domain/create-new!
+        (domain/create-new! (:params req)
-         (:params req)
                             schema-uuid
                             (get-in req [:session :uuid]))
         (resp/redirect (path :schema-show {:uuid schema-uuid})))

src/wanijo/schema/routes.clj

@@ -72,19 +72,7 @@
          (resp/redirect (path :schema-show (:params req)))
          :flash ["No write permission for schema"])))))
 
-(defroutes routes
+(defroutes write-routes
-  (GET "/403" [] {:status 403 :body "NE"})
-  (GET (register! :schema-overview "/schema")
-       []
-       view-schema/overview!)
-  (GET (register! :schema-show "/schema/:uuid")
-       [uuid :as req]
-       (view! uuid req))
-  (POST (register! :schema-new "/schema/new")
-        []
-        new!)
-  (wrap-allowed-to-write
-   (comp/routes
   (POST (register! :schema-edit "/schema/edit") []
         edit!)
   (POST (register! :schema-assign-users "/schema/assign/users") []
@@ -93,4 +81,15 @@
         assign-schemas!)
   (DELETE (register! :schema-delete "/schema/:uuid")
           [uuid :as req]
-            (delete-schema! uuid (:session req))))))
+          (delete-schema! uuid (:session req))))
+
+(defroutes routes
+  (GET (register! :schema-overview "/schema") []
+       view-schema/overview!)
+  (GET (register! :schema-show "/schema/:uuid")
+       [uuid :as req]
+       (view! uuid req))
+  (POST (register! :schema-new "/schema/new") []
+        new!)
+  (comp/wrap-routes write-routes
+                    wrap-allowed-to-write))

src/wanijo/schema/view.clj

@@ -1,5 +1,6 @@
 (ns wanijo.schema.view
-  (:require [hiccup.form :as hform]
+  (:require [clojure.string :refer [capitalize]]
+            [hiccup.form :as hform]
             [ring.util.anti-forgery :refer [anti-forgery-field]]
             [formulare.core :as form]
             [wanijo.framework.view :as view]
@@ -21,10 +22,8 @@
             :type {:label "Type"
                    :required true
                    :spec ::attr-domain/type
-                   :options [["String" "string"]
+                   :options (map #(vector (capitalize %) %)
-                             ["Text" "text"]
+                                 attr-domain/types)}
-                             ["Date" "date"]
-                             ["File" "file"]]}
             :required {:label "Required"
                        :required false
                        :spec ::attr-domain/required