Merge pull request #1361 from rdmorganiser/2.3.2

RDMO 2.3.2 🐛🐛

Author: jochenklar

.github/workflows/ci.yml

@@ -55,7 +55,7 @@ jobs:
     # build the webpack bundle
     - uses: actions/setup-node@v4
       with:
-        node-version: 18
+        node-version: 22
         cache: npm
     - run: npm ci && npm run build:dist
     # build the wheel
@@ -246,7 +246,7 @@ jobs:
         run: python -m pip check
       - uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 22
           cache: npm
       - run: npm install --include=dev
       - name: Write info to step summary

.nvmrc

@@ -1 +1 @@
-18.20.1
+22.16

.pre-commit-config.yaml

@@ -22,12 +22,12 @@ repos:
         exclude: \.dot$
       - id: debug-statements
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.11.8
+    rev: v0.11.12
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]
   - repo: https://github.com/pre-commit/mirrors-eslint
-    rev: v9.26.0
+    rev: v9.28.0
     hooks:
       - id: eslint
         args: [--fix, --color]

CHANGELOG.md

@@ -1,4 +1,24 @@
-# Changelog
+# Changelog 📔
+
+## [RDMO 2.3.2](https://github.com/rdmorganiser/rdmo/compare/2.3.1...2.3.2) (July 4, 2025)
+
+* Improve ORCID branding display and social connections page (#1376)
+* Hide management panels by default (#1377)
+* Fix sets in the interview (#1367)
+* Fix copy value and apply only to empty sets (#1384)
+* Fix compute progress for non-empty values (#1374)
+* Fix bugs in sync of project tasks and views (#1362)
+  * Added management command `./manage.py sync_projects`, with flags `--tasks`, `--views` or `--show`
+* Fix scroll focus (#1372)
+* Fix options in project export (use `uri_path`)
+* Fix historical typo in naming of `QuerySet` classes
+* [Add a PNG version of the logo](https://github.com/rdmorganiser/rdmo/pull/1361/commits/c21b7bafcf284ec7ac3b40b5c425fee207ddf461)
+
+### Maintenance and Dependencies 🔧
+
+* Removed dependency on `pytz` from management commands (#1382)
+* Refactor export tests and include tests code in coverage (#1319)
+* Update NodeJS version to 22 LTS (#1371)
 
 ## [RDMO 2.3.1](https://github.com/rdmorganiser/rdmo/compare/2.3.0...2.3.1) (May 16, 2025)
 

package-lock.json

@@ -13,6 +13,10 @@
     "type": "git",
     "url": "https://github.com/rdmorganiser/rdmo"
   },
+  "engines": {
+    "node": "22.16.x",
+    "npm": "10.x"
+  },
   "dependencies": {
     "@codemirror/lang-html": "^6.4.2",
     "@codemirror/lang-javascript": "^6.2.2",
@@ -54,7 +58,7 @@
     "eslint-plugin-react": "^7.37.2",
     "file-loader": "^6.2.0",
     "mini-css-extract-plugin": "^2.9.0",
-    "sass": "^1.87.0",
+    "sass": "^1.89.1",
     "sass-loader": "^16.0.0",
     "webpack": "^5.99.7",
     "webpack-cli": "^6.0.1",

package.json

@@ -65,7 +65,7 @@ dependencies = [
 
 [project.optional-dependencies]
 allauth = [
-  "django-allauth[socialaccount,openid]>=64.1.0,<65.8.0",
+  "django-allauth[socialaccount,openid]>=64.1.0,<65.10.0",
 ]
 ci = [
   "rdmo[dev]",
@@ -229,13 +229,11 @@ parallel = true
 
 [tool.coverage.report]
 omit = [
-    "*/management/*",
+    "*/management/commands/*",
     "*/migrations/*",
-    "*/tests/*",
 ]
 exclude_lines = [
-    "raise Exception",
-    "except ImportError:"
+    "raise NotImplementedError"
 ]
 
 [tool.typos] # Ref: https://github.com/crate-ci/typos/blob/master/docs/reference.md

pyproject.toml

@@ -1 +1 @@
-__version__ = "2.3.1"
+__version__ = "2.3.2"

rdmo/__init__.py

@@ -1,5 +1,7 @@
 {% extends 'core/page.html' %}
 {% load i18n %}
+{% load static %}
+{% load accounts_tags %}
 
 {% block page %}
 
@@ -28,8 +30,15 @@ <h2>{% trans 'Current connections' %}</h2>
 
             <label for="id_account_{{ base_account.id }}">
                 <input id="id_account_{{ base_account.id }}" type="radio" name="account" value="{{ base_account.id }}"/>
+
+                {% if base_account.provider == 'orcid' %}
+                <a href="https://orcid.org/{{ base_account.uid }}" target="_blank">
+                    <img alt="ORCID logo" src="{% static 'accounts/img/orcid_16x16.png' %}" width="16" height="16" />
+                    https://orcid.org/{{ base_account.uid }}
+                </a>
+                {% else %}
                 <span>{{account.get_brand.name}}</span>
-                <span>({{ account }})</span>
+                {% endif %}
             </label>
 
             {% endwith %}
@@ -55,11 +64,14 @@ <h2>{% trans 'Current connections' %}</h2>
 
     {% endif %}
 
+    {% get_inactive_providers as inactive_providers %}
+    {% if inactive_providers %}
     <h2>{% trans 'Add an additional account' %}</h2>
 
     <ul class="socialaccount_providers">
-    {% include "socialaccount/snippets/provider_list.html" with process="connect" %}
+    {% include "socialaccount/snippets/provider_list.html" with process="connect" socialaccount_providers=inactive_providers %}
     </ul>
+    {% endif %}
 
     {% include "socialaccount/snippets/login_extra.html" %}
 

rdmo/accounts/templates/socialaccount/connections.html

@@ -1,7 +1,9 @@
 {% load socialaccount %}
 {% load static %}
 
+{% if not socialaccount_providers %}
 {% get_providers as socialaccount_providers %}
+{% endif %}
 
 {% for provider in socialaccount_providers %}
 
@@ -18,35 +20,46 @@
 {% endif %}
 
 {% if provider.id == 'orcid' %}
+
 <li class="socialaccount_provider_break">
     <a title="{{provider.name}}" class="socialaccount_provider {{provider.id}}"
         href="{% provider_login_url provider.id process=process scope=scope auth_params=auth_params %}">
         <img src="{% static 'accounts/img/orcid-signin.png' %}" alt="ORCID sign in" />
     </a>
 </li>
+
 {% elif provider.id == 'openid_connect' %}
-    {% if provider.app.provider_id == 'keycloak' %}
-    <li class="socialaccount_provider_break">
-        <a title="{{ provider.name }}" class="socialaccount_provider {{ provider.id }}"
-            href="{% provider_login_url provider process=process scope=scope auth_params=auth_params %}">
-            <img src="{% static 'accounts/img/keycloak_logo_200px.svg' %}" alt="Keycloak sign in" />
-        </a>
-    </li>
-    {% else %}
-    <li>
-        <a title="{{provider.name}}" class="socialaccount_provider {{provider.id}}"
-            href="{% provider_login_url provider process=process scope=scope auth_params=auth_params %}">
-            {{ provider.name }}
-        </a>
-    </li>
+
+{% if provider.app.provider_id == 'keycloak' %}
+<li class="socialaccount_provider_break">
+    <a title="{{ provider.name }}" class="socialaccount_provider {{ provider.app.provider_id }}"
+        href="{% provider_login_url provider process=process scope=scope auth_params=auth_params %}">
+        <img src="{% static 'accounts/img/keycloak_logo_200px.svg' %}" alt="Keycloak sign in" />
+    </a>
+</li>
+{% else %}
+<li>
+    <a title="{{ provider.name }}" class="socialaccount_provider {{ provider.app.provider_id }}"
+        href="{% provider_login_url provider process=process scope=scope auth_params=auth_params %}">
+        {{ provider.name }}
+    </a>
+</li>
 {% endif %}
 
+
 {% else %}
+
 <li>
     <a title="{{provider.name}}" class="socialaccount_provider {{provider.id}}"
         href="{% provider_login_url provider.id process=process scope=scope auth_params=auth_params %}">
+        {% if provider.id == 'dummy' %}
+        <span class="fa fa-meh-o fa-2x"></span>
+        {% else %}
         <span class="fa fa-{{provider.id}} fa-2x"></span>
+        {% endif %}
     </a>
 </li>
+
 {% endif %}
+
 {% endfor %}