Merge pull request #791 from CSCfi/fix-workflow-editor2

fix: workflow editor
CSCfi · Dec 13, 2018 · 490a5be · 490a5be
2 parents 2045114 + cdfa67a
commit 490a5be
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/src/cljs/rems/administration/workflow.cljs b/src/cljs/rems/administration/workflow.cljs
@@ -54,17 +54,18 @@
          :rounds (every? valid-round? (:rounds request))
          nil false)))
 
-(defn- build-request-round [round]
-  (select-keys round [:type :actors]))
+(defn- build-request-round [{:keys [type actors]}]
+  {:type type
+   :actors (map :userid actors)})
 
 (defn build-request [form]
   (let [request {:organization (:organization form)
                  :title (:title form)
                  :type (:type form)}
         request (case (:type form)
                   :auto-approve request
-                  :dynamic (assoc request :handlers (:handlers form))
-                  :rounds (assoc request :rounds (map build-request-round (:rounds form))))]
+                  :dynamic (assoc request :handlers (map :userid (:handlers form)))
+                  :rounds (assoc request :rounds (map build-request-round (vals (:rounds form)))))]
     (when (valid-request? request)
       request)))
 

diff --git a/test/cljs/rems/test/administration/workflow.cljs b/test/cljs/rems/test/administration/workflow.cljs
@@ -33,7 +33,7 @@
     (let [form {:organization "abc"
                 :title "workflow title"
                 :type :dynamic
-                :handlers ["bob" "carl"]}]
+                :handlers [{:userid "bob"} {:userid "carl"}]}]
       (testing "valid form"
         (is (= {:organization "abc"
                 :title "workflow title"
@@ -47,10 +47,10 @@
     (let [form {:organization "abc"
                 :title "workflow title"
                 :type :rounds
-                :rounds [{:type :review
-                          :actors ["alice" "bob"]}
-                         {:type :approval
-                          :actors ["carl"]}]}]
+                :rounds {0 {:type :review
+                          :actors [{:userid "alice"} {:userid "bob"}]}
+                         1 {:type :approval
+                          :actors [{:userid "carl"}]}}}]
       (testing "valid form"
         (is (= {:organization "abc"
                 :title "workflow title"