Merge pull request #911 from CSCfi/create-catalogue-item-disabled

Create catalogue item disabled
CSCfi · Feb 11, 2019 · 5071adc · 5071adc
2 parents 88c0406 + d99bfcb
commit 5071adc
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 8 deletions.
diff --git a/resources/sql/queries.sql b/resources/sql/queries.sql
@@ -45,8 +45,14 @@ WHERE ci.id = :item
 -- :name create-catalogue-item! :insert
 -- :doc Create a single catalogue item
 INSERT INTO catalogue_item
-(title, formid, resid, wfid)
-VALUES (:title, :form, :resid, :wfid)
+(title, formid, resid, wfid, state)
+VALUES (:title, :form, :resid, :wfid,
+/*~ (if (:state params) */
+CAST(:state as item_state)
+/*~*/
+'enabled'
+/*~ ) ~*/
+)
 
 -- :name get-resources :? :*
 SELECT

diff --git a/src/clj/rems/api/catalogue_items.clj b/src/clj/rems/api/catalogue_items.clj
@@ -17,7 +17,8 @@
   {:title s/Str
    :form s/Num
    :resid s/Num
-   :wfid s/Num})
+   :wfid s/Num
+   (s/optional-key :state) (s/maybe s/Str)})
 
 (s/defschema CreateCatalogueItemResponse
   CatalogueItem)

diff --git a/src/clj/rems/db/catalogue.clj b/src/clj/rems/db/catalogue.clj
@@ -35,7 +35,7 @@
     (localize-catalogue-item item)))
 
 (defn create-catalogue-item! [command]
-  (let [id (:id (db/create-catalogue-item! (select-keys command [:title :form :resid :wfid])))]
+  (let [id (:id (db/create-catalogue-item! (select-keys command [:title :form :resid :wfid :state])))]
     (get-localized-catalogue-item id)))
 
 (defn create-catalogue-item-localization! [command]

diff --git a/src/cljs/rems/administration/create_catalogue_item.cljs b/src/cljs/rems/administration/create_catalogue_item.cljs
@@ -89,8 +89,13 @@
     (when (valid-request? request)
       request)))
 
+(defn- create-request-with-state [request]
+  (if (nil? (:state request))
+    (merge {:state "disabled"} request)
+    request))
+
 (defn- create-catalogue-item [request]
-  (post! "/api/catalogue-items/create" {:params request
+  (post! "/api/catalogue-items/create" {:params (create-request-with-state request)
                                         ;; TODO error handling
                                         :handler (fn [resp] (dispatch! "#/administration/catalogue-items"))}))
 

diff --git a/test/clj/rems/test/api/applications.clj b/test/clj/rems/test/api/applications.clj
@@ -689,7 +689,8 @@
       (json-body {:title ""
                   :form form-id
                   :resid 1
-                  :wfid 1})
+                  :wfid 1
+                  :state "enabled"})
       app
       read-ok-body
       :id))

diff --git a/test/clj/rems/test/api/catalogue_items.clj b/test/clj/rems/test/api/catalogue_items.clj
@@ -23,7 +23,8 @@
                    (json-body {:title "test-item-title"
                                :form 1
                                :resid 1
-                               :wfid 1})
+                               :wfid 1
+                               :state "enabled"})
                    app
                    read-body)]
       (is (= 11 (:id data))))

diff --git a/test/clj/rems/test/api/forms.clj b/test/clj/rems/test/api/forms.clj
@@ -17,7 +17,8 @@
                            (json-body {:title "tmp"
                                        :form form-id
                                        :resid 1
-                                       :wfid 1})
+                                       :wfid 1
+                                       :state "enabled"})
                            app
                            assert-response-is-ok
                            read-body)