refactor: factor out user-selection widget for actions

resources/translations/en.edn

@@ -40,7 +40,6 @@
             :remove-member "Remove member"
             :request-decision "Request decision"
             :request-review "Request review"
-            :request-selection "Send request to"
             :request-selections "Send requests to"
             :resources-selection "Resources included in the application:"
             :return "Return to applicant"

resources/translations/fi.edn

@@ -40,7 +40,6 @@
             :remove-member "Poista jäsen"
             :request-decision "Pyydä päätöstä"
             :request-review "Pyydä katselmointia"
-            :request-selection "Lähetä pyyntö henkilölle"
             :request-selections "Lähetä pyynnöt henkilöille"
             :resources-selection "Hakemukseen liitettävät resurssit:"
             :return "Palauta hakijalle"

resources/translations/sv.edn

@@ -40,7 +40,6 @@
             :remove-member "Ta bort deltagare"
             :request-decision "Begär beslut"
             :request-review "Begär granskning"
-            :request-selection "Skicka begäran till"
             :request-selections "Skicka begäranden till"
             :resources-selection "Välj resurser som ansökan gäller:"
             :return "Sänd tillbaka till sökande"

src/cljs/rems/actions/components.cljs

@@ -117,6 +117,7 @@
                                  :on-attach #(rf/dispatch [::save-attachment application-id field-key %])
                                  :on-remove-attachment #(rf/dispatch [::remove-attachment field-key %])}])
 
+(fetcher/reg-fetcher ::reviewers "/api/applications/reviewers" {:result (partial map enrich-user)})
 (fetcher/reg-fetcher ::deciders "/api/applications/deciders" {:result (partial map enrich-user)})
 
 (rf/reg-sub ::users (fn [db [_ field-key]] (get-in db [::users field-key])))

src/cljs/rems/actions/request_review.cljs

@@ -1,43 +1,18 @@
 (ns rems.actions.request-review
   (:require [re-frame.core :as rf]
-            [rems.actions.components :refer [action-attachment action-button comment-field action-form-view button-wrapper command!]]
-            [rems.atoms :refer [enrich-user]]
-            [rems.dropdown :as dropdown]
-            [rems.flash-message :as flash-message]
-            [rems.text :refer [text]]
-            [rems.util :refer [fetch]]))
+            [rems.actions.components :refer [action-attachment action-button comment-field action-form-view button-wrapper command! user-selection]]
+            [rems.text :refer [text]]))
 
 (def ^:private action-form-id "request-review")
-(def ^:private dropdown-id "request-review-dropdown")
-
-(rf/reg-fx
- ::fetch-potential-reviewers
- (fn [on-success]
-   (fetch "/api/applications/reviewers"
-          {:handler on-success
-           :error-handler (flash-message/default-error-handler :top "Fetch potential reviewers")})))
 
 (rf/reg-event-fx
  ::open-form
  (fn
-   [{:keys [db]} _]
-   {:db (assoc db
-               ::potential-reviewers #{}
-               ::selected-reviewers #{})
-    :dispatch-n [[:rems.actions.components/set-comment action-form-id nil]
-                 [:rems.actions.components/set-attachments action-form-id []]]
-    ::fetch-potential-reviewers #(rf/dispatch [::set-potential-reviewers %])}))
-
-(rf/reg-sub ::potential-reviewers (fn [db _] (::potential-reviewers db)))
-(rf/reg-event-db
- ::set-potential-reviewers
- (fn [db [_ reviewers]]
-   (assoc db
-          ::potential-reviewers (set (map enrich-user reviewers))
-          ::selected-reviewers #{})))
-
-(rf/reg-sub ::selected-reviewers (fn [db _] (::selected-reviewers db)))
-(rf/reg-event-db ::set-selected-reviewers (fn [db [_ reviewers]] (assoc db ::selected-reviewers reviewers)))
+   [_ _]
+   {:dispatch-n [[:rems.actions.components/reviewers]
+                 [:rems.actions.components/set-users action-form-id nil]
+                 [:rems.actions.components/set-comment action-form-id nil]
+                 [:rems.actions.components/set-attachments action-form-id []]]}))
 
 (rf/reg-event-fx
  ::send-request-review
@@ -58,39 +33,28 @@
                   :on-click #(rf/dispatch [::open-form])}])
 
 (defn request-review-view
-  [{:keys [application-id selected-reviewers potential-reviewers on-set-reviewers on-send]}]
+  [{:keys [application-id disabled on-send]}]
   [action-form-view action-form-id
    (text :t.actions/request-review)
    [[button-wrapper {:id "request-review-button"
                      :text (text :t.actions/request-review)
                      :class "btn-primary"
                      :on-click on-send
-                     :disabled (empty? selected-reviewers)}]]
+                     :disabled disabled}]]
    [:div
     [comment-field {:field-key action-form-id
                     :label (text :t.form/add-comments-not-shown-to-applicant)}]
     [action-attachment {:field-key action-form-id
                         :application-id application-id}]
-    [:div.form-group
-     [:label {:for dropdown-id} (text :t.actions/request-selections)]
-     [dropdown/dropdown
-      {:id dropdown-id
-       :items potential-reviewers
-       :item-key :userid
-       :item-label :display
-       :item-selected? #(contains? (set selected-reviewers) %)
-       :multi? true
-       :on-change on-set-reviewers}]]]])
+    [user-selection {:field-key action-form-id
+                     :subscription [:rems.actions.components/reviewers]}]]])
 
 (defn request-review-form [application-id on-finished]
-  (let [selected-reviewers @(rf/subscribe [::selected-reviewers])
-        potential-reviewers @(rf/subscribe [::potential-reviewers])
+  (let [selected-reviewers @(rf/subscribe [:rems.actions.components/users action-form-id])
         comment @(rf/subscribe [:rems.actions.components/comment action-form-id])
         attachments @(rf/subscribe [:rems.actions.components/attachments action-form-id])]
     [request-review-view {:application-id application-id
-                          :selected-reviewers selected-reviewers
-                          :potential-reviewers potential-reviewers
-                          :on-set-reviewers #(rf/dispatch [::set-selected-reviewers %])
+                          :disabled (empty? selected-reviewers)
                           :on-send #(rf/dispatch [::send-request-review {:application-id application-id
                                                                          :reviewers selected-reviewers
                                                                          :comment comment