Develop

.circleci/config.yml

@@ -84,6 +84,8 @@ jobs:
       - run: lein kaocha --reporter kaocha.report/documentation --plugin rems.kaocha/cache-statistics-plugin integration
       - store_test_results:
           path: target/test-results
+      - store_artifacts:
+          path: target/cache-statistics-plugin
 
   browser-test:
     executor: db
@@ -98,7 +100,7 @@ jobs:
           at: .
       - restore_cache:
           key: *cache-key
-      - run: lein kaocha --reporter kaocha.report/documentation --plugin rems.kaocha/cache-statistics-plugin --plugin rems.kaocha/circleci-plugin browser
+      - run: lein kaocha --reporter kaocha.report/documentation --plugin rems.kaocha/cache-statistics-plugin --plugin rems.kaocha/circleci-parallel-plugin browser
       - store_test_results:
           path: target/test-results
       - store_artifacts:
@@ -107,6 +109,10 @@ jobs:
           path: browsertest-downloads
       - store_artifacts:
           path: browsertest-accessibility-report
+      - store_artifacts:
+          path: target/cache-statistics-plugin
+      - store_artifacts:
+          path: target/circleci-parallel-plugin
 
   build:
     executor: clojure

.github/workflows/admin-utils-docker-build.yml

@@ -6,8 +6,8 @@ on:
       - develop
       - master
     paths:
-      - 'adminUtils.Dockerfile'       
-      - '.github/workflows/admin-utils-docker-build.yml'
+      - "adminUtils.Dockerfile"
+      - ".github/workflows/admin-utils-docker-build.yml"
   workflow_dispatch:
 
 permissions:

CHANGELOG.md

@@ -17,9 +17,15 @@ Changes since v2.38.1
   - When creating attachment license, the save button no longer activates until all attachments have been successfully uploaded. (#3292)
   - Attachment upload error is indicated by small icon next to the upload button (detailed error is still shown in top of the page).
   - Pending attachment upload is indicated by spinner next to the upload button.
+- Edit buttons on the administration detail pages are hidden when the user is not permitted to edit, like they are hidden on the list pages already (#2814)
 
 ### Fixes
 - Resolved issue where workflow voting could not be removed, which caused UI to display raw translation keys due to nil voting values. (#3357)
+- Fixed an issue with the application page where the 'Add member' dropdown menu displayed members that already exist in the application.  (#1412)
+- Document title no longer shows an extra em dash when the localized application title is empty. (#3398)
+- Fix audit log API. Technical error from incorrect response. (#3380)
+- Fixes to enable JVM 25 support (https://github.com/tolitius/cprop/issues/60, https://clojure.atlassian.net/browse/CLJ-2764)
+- Catalogue table had the add/remove cart commands even when not logged in. (#3408)
 
 ## v2.38.1 "Välimerenkatu +1" 2025-01-27
 

README.md

@@ -33,7 +33,7 @@ See the [release page](https://github.com/CSCfi/rems/releases) for the releases.
 - We welcome [issues through GitHub](https://github.com/CSCfi/rems/issues).
 - You can [contact the team on the discussion board](https://github.com/CSCfi/rems/discussions) or [via email](mailto:rems@csc.fi).
 - In case you would like to contribute to the development, perhaps you participate in Hacktoberfest, then please refer to the [contributing document](CONTRIBUTING.md). We'll guide you through to get your pull request reviewed and merged.
-- You can follow the progress of the project on the [GitHub project board]([https://github.com/CSCfi/rems/projects/1](https://github.com/orgs/CSCfi/projects/13)).
+- You can follow the progress of the project on the [GitHub project board](https://github.com/orgs/CSCfi/projects/13/views/1).
 
 ## Documentation
 
@@ -43,3 +43,7 @@ You can check out the API docs using
 [the swagger-ui of the public demo instance](https://rems-test.2.rahtiapp.fi/swagger-ui).
 
 Documentation can be found under the [docs](./docs) folder.
+
+## See Also
+
+[REMS-COmanage bridge service](https://github.com/GUARDIANS-infrastructure/rems-co) – Service that synchronizes entitlements between REMS and a COManage registry.

dev-config.edn

@@ -56,7 +56,8 @@
                 :heading false
                 :translations {:fi {:title "Mixed"
                                     :filename "mixed-fi.md"}
-                               :en {:url "https://example.org/en/mixed"}} ; missing sv and da
+                               :en {:title "Mixed"
+                                    :url "https://example.org/en/mixed"}} ; missing sv and da
                 :show-menu false
                 :show-footer false}
                {:id "unlocalized"

docs/presentations/README.md

@@ -4,11 +4,11 @@ Here we have presentation materials for REMS. Each presentation is in the form o
 
 ## How to use – reveal.js
 
-Follow the [https://revealjs.com/installation/#full-setup](instructions) to setup reveal.js, and off you go.
+Follow the [instructions](https://revealjs.com/installation/#full-setup) to setup reveal.js, and off you go.
 
 ## How to use – CSC's training template
 
-This is a bit more cumbersome than the previous example but does not require setting up a local web server. [https://pandoc.org](Pandoc) is required, however.
+This is a bit more cumbersome than the previous example but does not require setting up a local web server. [Pandoc](https://pandoc.org) is required, however.
 
 1. `git clone https://github.com/csc-training/slide-template`
 

src/clj/rems/api/audit_log.clj

@@ -1,6 +1,7 @@
 (ns rems.api.audit-log
   (:require [compojure.api.sweet :refer :all]
             [rems.db.core :as db]
+            [ring.util.http-response :refer [ok]]
             [schema.core :as s])
   (:import (org.joda.time DateTime)))
 
@@ -23,8 +24,8 @@
                      {before :- (describe DateTime "Only show entries before this time") nil}]
       :roles #{:reporter}
       :return [AuditLogEntry]
-      (db/get-audit-log {:userid userid
-                         :after after
-                         :path (when application-id
-                                 (str "/api/applications/" application-id "%"))
-                         :before before}))))
+      (ok (db/get-audit-log {:userid userid
+                             :after after
+                             :path (when application-id
+                                     (str "/api/applications/" application-id "%"))
+                             :before before})))))

src/clj/rems/cache.clj

@@ -1,7 +1,6 @@
 (ns rems.cache
   (:require [clojure.core.cache.wrapped :as w]
             [clojure.tools.logging.readable :as logr]
-            [medley.core :refer [update-existing]]
             [rems.common.util :refer [build-index]]
             [rems.common.dependency :as dep]
             [rems.config]))
@@ -11,8 +10,6 @@
 
 (def ^{:doc "Value that tells cache to skip entry."} absent ::absent)
 
-(def ^:private initial-statistics {:get 0 :reload 0 :upsert 0 :evict 0})
-
 (defprotocol RefreshableCacheProtocol
   "Protocol for cache wrapper that can refresh the underlying cache."
 
@@ -40,8 +37,6 @@
 
   (export-statistics! [this]
     "Retrieves runtime statistics from cache, and resets appropriate counters.")
-  (increment-get-statistic! [this]
-    "Increments cache access counter.")
   (increment-reload-statistic! [this]
     "Increments cache reload counter.")
   (increment-upsert-statistic! [this]
@@ -73,14 +68,13 @@
   CacheStatisticsProtocol
 
   (export-statistics! [this]
-    (let [stats @statistics]
-      (reset! statistics (select-keys initial-statistics (keys stats)))
-      stats))
+    (let [value @statistics]
+      (reset! statistics {:reload 0 :upsert 0 :evict 0})
+      value))
 
-  (increment-get-statistic! [this] (swap! statistics update-existing :get inc))
-  (increment-reload-statistic! [this] (swap! statistics update :reload inc))
-  (increment-upsert-statistic! [this] (swap! statistics update :upsert inc))
-  (increment-evict-statistic! [this] (swap! statistics update :evict inc))
+  (increment-reload-statistic! [this] (some-> statistics (swap! update :reload inc)))
+  (increment-upsert-statistic! [this] (some-> statistics (swap! update :upsert inc)))
+  (increment-evict-statistic! [this] (some-> statistics (swap! update :evict inc)))
 
   RefreshableCacheProtocol
 
@@ -106,8 +100,6 @@
 
   (ensure-initialized! [this]
     ;; NB: reading requires no locking
-    (increment-get-statistic! this)
-
     (if @initialized?
       @the-cache
       (reload! this)))
@@ -184,23 +176,27 @@
         (increment-evict-statistic! this)
         (logr/debug "<" id :evict k)))))
 
-(defn basic [{:keys [depends-on id miss-fn reload-fn]}]
+(defn- ensure-cache-id-unique! [id]
   (when (contains? @caches id)
+    ;; NB: even if config is not started, we default to assert
     (if (:dev rems.config/env)
       (logr/warnf "overriding cache id %s" id)
-      (assert false (format "error overriding cache id %s" id))))
-  (let [initialized? false
-        statistics (if (:dev rems.config/env)
-                     initial-statistics
-                     (select-keys initial-statistics [:reload :upsert :evict])) ; :get statistics can become big quickly
-        the-cache (w/basic-cache-factory {})
-        cache (->RefreshableCache id
-                                  (atom statistics)
-                                  (atom initialized?)
-                                  the-cache
-                                  miss-fn
-                                  (or reload-fn (constantly {})))]
-    (swap! caches assoc id cache)
-    (swap! caches-dag dep/depend id depends-on) ; noop when empty depends-on
-    (add-watch the-cache id reset-dependents-on-change!)
-    cache))
+      (assert false (format "error overriding cache id %s" id)))))
+
+(defn basic [{:keys [depends-on id miss-fn reload-fn]}]
+  (or (ensure-cache-id-unique! id)
+      (let [initialized? false
+            statistics {}
+            the-cache (w/basic-cache-factory {})
+            cache (->RefreshableCache id
+                                      (atom statistics)
+                                      (atom initialized?)
+                                      the-cache
+                                      miss-fn
+                                      (or reload-fn (constantly {})))
+            _ (export-statistics! cache) ; NB: initializes statistics
+            ]
+        (swap! caches assoc id cache)
+        (swap! caches-dag dep/depend id depends-on) ; noop when empty depends-on
+        (add-watch the-cache id reset-dependents-on-change!)
+        cache)))

src/clj/rems/config.clj

@@ -3,7 +3,7 @@
             [clojure.java.io :as io]
             [clojure.test :refer :all]
             [clojure.tools.logging :as log]
-            [cprop.core :refer [load-config]]
+            [cprop.core]
             [cprop.source :as source]
             [cprop.tools :refer [merge-maps]]
             [medley.core :refer [update-existing]]
@@ -14,6 +14,14 @@
   (:import [java.io FileNotFoundException]
            [org.joda.time Period]))
 
+(defn load-config [& args]
+  ;; XXX: workaround for JVM 25 for cprop until fix is released https://github.com/tolitius/cprop/issues/60
+  (let [expand-home cprop.tools/expand-home]
+    (with-redefs [cprop.tools/expand-home #(if (empty? %)
+                                             nil
+                                             (expand-home %))]
+      (apply cprop.core/load-config args))))
+
 (defn- file-sibling [file sibling-name]
   (.getPath (io/file (.getParentFile (io/file file))
                      sibling-name)))

src/cljc/rems/common/roles.cljc

@@ -50,3 +50,8 @@
                            (some (comp #{(-> item :organization :organization/id)} :organization/id)))]
        (or owner?
            org-owner?))))
+
+#?(:cljs
+   (defn show-when-can-modify-organization-item [item & body]
+     (when (can-modify-organization-item? item)
+       (into [:<> body]))))

src/cljs/rems/actions/add_member.cljs

@@ -22,12 +22,23 @@
                ::selected-member nil)
     ::fetch-potential-members #(rf/dispatch [::set-potential-members %])}))
 
-(rf/reg-sub ::potential-members (fn [db _] (::potential-members db)))
+(defn potential-members [db]
+  (let [application (get-in db [:rems.application/application :data])
+        applicant-id (get-in application [:application/applicant :userid])
+        members (get-in application [:application/members])
+        existing-ids (into #{applicant-id} 
+                           (map :userid members))]
+    (->> ::potential-members db
+         (remove (comp existing-ids :userid))
+         (map atoms/enrich-user))))
+
+(rf/reg-sub ::potential-members potential-members)
+
 (rf/reg-event-db
  ::set-potential-members
  (fn [db [_ members]]
    (assoc db
-          ::potential-members (set (map atoms/enrich-user members))
+          ::potential-members members
           ::selected-member nil)))
 
 (rf/reg-event-db ::set-selected-member (fn [db [_ member]] (assoc db ::selected-member member)))

src/cljs/rems/administration/catalogue_item.cljs

@@ -104,11 +104,11 @@
    (let [id (:id catalogue-item)]
      [:div.col.commands
       [administration/back-button "/administration/catalogue-items"]
-      [roles/show-when roles/+admin-write-roles+
+      [roles/show-when-can-modify-organization-item catalogue-item
        [edit-button id]
        [perform-action-button (toggle-enabled catalogue-item)]
-       [perform-action-button (toggle-archived catalogue-item)]]
-      [manage-categories-button]])])
+       [perform-action-button (toggle-archived catalogue-item)]
+       [manage-categories-button]]])])
 
 (defn catalogue-item-page []
   (let [catalogue-item (rf/subscribe [::catalogue-item])

src/cljs/rems/administration/catalogue_items.cljs

@@ -87,7 +87,9 @@
   [atoms/rate-limited-action-button
    {:id :update-catalogue-item
     :class "btn-primary"
-    :disabled (when (empty? items) :disabled)
+    :disabled (when (or (empty? items)
+                        (not-every? roles/can-modify-organization-item? items))
+                :disabled)
     :on-click (fn []
                 (rf/dispatch [:rems.administration.update-catalogue-item/enter-page items])
                 (navigate! "/administration/catalogue-items/update-catalogue-item"))