Skip to content

Commit

Permalink
Merge pull request #1124 from CSCfi/small-fixes-2019-04-15
Browse files Browse the repository at this point in the history 
Small fixes
  • Loading branch information
@opqdonut
opqdonut committed Apr 15, 2019
2 parents f140ad8 + 4bef311 commit efb7533
Show file tree
Hide file tree
Showing 7 changed files with 41 additions and 59 deletions.
5 changes: 2 additions & 3 deletions src/clj/rems/application/model.clj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,6 @@
(defmethod event-type-specific-application-view :application.event/licenses-accepted
[application event]
(-> application
(assoc :application/modified (:event/time event))
(assoc-in [:application/accepted-licenses (:event/actor event)] (:application/accepted-licenses event))))

(defmethod event-type-specific-application-view :application.event/licenses-added
Expand All @@ -207,8 +206,8 @@
(fn [licenses]
(-> licenses
(into (:application/licenses event))
distinct
vec)))))
distinct
vec)))))

(defmethod event-type-specific-application-view :application.event/member-invited
[application event]
Expand Down
7 changes: 3 additions & 4 deletions src/cljs/rems/actions/accept_invitation.cljs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
(fn [{:keys [db]} [_ token]]
(status-modal/common-pending-handler! (text :t.actions/accept-invitation))
{:db (assoc db ::token token)
::accept-invitation [(get-in db [:identity :user]) token]}))
::accept-invitation token}))

(rf/reg-sub ::token (fn [db] (::token db "")))

Expand Down Expand Up @@ -41,12 +41,11 @@

(rf/reg-fx
::accept-invitation
(fn [[user token]]
(fn [token]
(post! "/api/applications/accept-invitation"
{:url-params {:invitation-token token}
:handler success-handler
:error-handler error-handler
:headers {"x-rems-user-id" (:eppn user)}})))
:error-handler error-handler})))

(defn accept-invitation-page []
(let [token @(rf/subscribe [::token])]
Expand Down
11 changes: 4 additions & 7 deletions src/cljs/rems/actions/add_licenses.cljs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,8 @@

(rf/reg-fx
::fetch-licenses
(fn [[user on-success]]
(fetch "/api/licenses"
{:handler on-success
:headers {"x-rems-user-id" (:eppn user)}})))
(fn [on-success]
(fetch "/api/licenses" {:handler on-success})))

(rf/reg-event-fx
::open-form
Expand All @@ -22,14 +20,13 @@
::comment ""
::potential-licenses #{}
::selected-licenses #{})
::fetch-licenses [(get-in db [:identity :user])
#(rf/dispatch [::set-potential-licenses %])]}))
::fetch-licenses #(rf/dispatch [::set-potential-licenses %])}))

(defn- assoc-all-titles
"Prepopulate `:all-titles` property to facilitate searching with localized names and unlocalized title"
[license]
(assoc license :all-titles (str/join "" (conj (mapcat :title (vals (:localizations license)))
(:title license)))))
(:title license)))))

(rf/reg-sub ::potential-licenses (fn [db _] (::potential-licenses db)))
(rf/reg-event-db
Expand Down
9 changes: 3 additions & 6 deletions src/cljs/rems/actions/add_member.cljs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,16 @@

(rf/reg-fx
::fetch-potential-members
(fn [[user on-success]]
(fetch "/api/applications/members"
{:handler on-success
:headers {"x-rems-user-id" (:eppn user)}})))
(fn [on-success]
(fetch "/api/applications/members" {:handler on-success})))

(rf/reg-event-fx
::open-form
(fn [{:keys [db]} _]
{:db (assoc db
::potential-members #{}
::selected-member nil)
::fetch-potential-members [(get-in db [:identity :user])
#(rf/dispatch [::set-potential-members %])]}))
::fetch-potential-members #(rf/dispatch [::set-potential-members %])}))

(rf/reg-sub ::potential-members (fn [db _] (::potential-members db)))
(rf/reg-event-db
Expand Down
9 changes: 3 additions & 6 deletions src/cljs/rems/actions/request_comment.cljs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,8 @@

(rf/reg-fx
::fetch-potential-commenters
(fn [[user on-success]]
(fetch "/api/applications/commenters"
{:handler on-success
:headers {"x-rems-user-id" (:eppn user)}})))
(fn [on-success]
(fetch "/api/applications/commenters" {:handler on-success})))

(rf/reg-event-fx
::open-form
Expand All @@ -22,8 +20,7 @@
::comment ""
::potential-commenters #{}
::selected-commenters #{})
::fetch-potential-commenters [(get-in db [:identity :user])
#(rf/dispatch [::set-potential-commenters %])]}))
::fetch-potential-commenters #(rf/dispatch [::set-potential-commenters %])}))

(rf/reg-sub ::potential-commenters (fn [db _] (::potential-commenters db)))
(rf/reg-event-db
Expand Down
9 changes: 3 additions & 6 deletions src/cljs/rems/actions/request_decision.cljs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,8 @@

(rf/reg-fx
::fetch-potential-deciders
(fn [[user on-success]]
(fetch "/api/applications/deciders"
{:handler on-success
:headers {"x-rems-user-id" (:eppn user)}})))
(fn [on-success]
(fetch "/api/applications/deciders" {:handler on-success})))

(rf/reg-event-fx
::open-form
Expand All @@ -21,8 +19,7 @@
::comment ""
::potential-deciders #{}
::selected-deciders #{})
::fetch-potential-deciders [(get-in db [:identity :user])
#(rf/dispatch [::set-potential-deciders %])]}))
::fetch-potential-deciders #(rf/dispatch [::set-potential-deciders %])}))

(rf/reg-sub ::potential-deciders (fn [db _] (::potential-deciders db)))
(rf/reg-event-db
Expand Down
50 changes: 23 additions & 27 deletions test/clj/rems/application/test_model.clj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -295,8 +295,7 @@
:application/id 1
:application/accepted-licenses #{30 31 32}})
expected-application (deep-merge expected-application
{:application/modified (DateTime. 2500)
:application/last-activity (DateTime. 2500)
{:application/last-activity (DateTime. 2500)
:application/events events
:application/accepted-licenses {"applicant" #{30 31 32}}})]
(is (= expected-application (apply-events events)))
Expand Down Expand Up @@ -395,21 +394,21 @@
:application/modified (DateTime. 3500)
:application/events events
:application/licenses (conj (:application/licenses expected-application)
{:license/id 33
:license/type :attachment
:license/title {:en "en title"
:fi "fi title"
:default "non-localized title"}
:license/attachment-id {:en 3301
:fi 3302
:default 3300}
:license/attachment-filename {:en "en filename"
:fi "fi filename"
:default "non-localized filename"}
:license/start (DateTime. 100)
:license/end nil
:license/expired false
:license/enabled true
{:license/id 33
:license/type :attachment
:license/title {:en "en title"
:fi "fi title"
:default "non-localized title"}
:license/attachment-id {:en 3301
:fi 3302
:default 3300}
:license/attachment-filename {:en "en filename"
:fi "fi filename"
:default "non-localized filename"}
:license/start (DateTime. 100)
:license/end nil
:license/expired false
:license/enabled true
:license/archived false})})]
(is (= expected-application (apply-events events)))

Expand All @@ -434,48 +433,45 @@
:application/id 1
:application/accepted-licenses #{30 31 32 33}})
expected-application (merge expected-application
{:application/modified (DateTime. 4500)
:application/last-activity (DateTime. 4500)
{:application/last-activity (DateTime. 4500)
:application/events events
:application/accepted-licenses {"applicant" #{30 31 32 33}}})]
(is (= expected-application (apply-events events)))

(testing "> member added"
(let [events (conj events
{:event/type :application.event/member-added
:event/time (DateTime. 4000)
:event/time (DateTime. 4600)
:event/actor "handler"
:application/id 1
:application/member {:userid "member"}})
expected-application (merge expected-application
{:application/last-activity (DateTime. 4000)
{:application/last-activity (DateTime. 4600)
:application/events events
:application/members #{{:userid "member"}}})]
(is (= expected-application (apply-events events)))
(testing "> licenses accepted for new member"
(let [events (conj events
{:event/type :application.event/licenses-accepted
:event/time (DateTime. 4500)
:event/time (DateTime. 4700)
:event/actor "member"
:application/id 1
:application/accepted-licenses #{30 33}})
expected-application (merge expected-application
{:application/modified (DateTime. 4500)
:application/last-activity (DateTime. 4500)
{:application/last-activity (DateTime. 4700)
:application/events events
:application/accepted-licenses {"applicant" #{30 31 32 33}
"member" #{30 33}}})]
(is (= expected-application (apply-events events)))
(testing "> licenses accepted overwrites previous"
(let [events (conj events
{:event/type :application.event/licenses-accepted
:event/time (DateTime. 4500)
:event/time (DateTime. 4800)
:event/actor "member"
:application/id 1
:application/accepted-licenses #{31 32}})
expected-application (merge expected-application
{:application/modified (DateTime. 4500)
:application/last-activity (DateTime. 4500)
{:application/last-activity (DateTime. 4800)
:application/events events
:application/accepted-licenses {"applicant" #{30 31 32 33}
"member" #{31 32}}})]
Expand Down

0 comments on commit efb7533

Please sign in to comment.