RDMO 2.0.0

.eslintrc.js

@@ -0,0 +1,46 @@
+module.exports = {
+  "globals": {
+    "gettext": true,
+    "ngettext": true,
+    "interpolate": true,
+    "process": true,
+    "require": true
+  },
+  "env": {
+    "browser": true,
+    "es2021": true
+  },
+  "extends": [
+    "eslint:recommended",
+    "plugin:react/recommended"
+  ],
+  "overrides": [],
+  "parserOptions": {
+    "ecmaVersion": "latest",
+    "sourceType": "module"
+  },
+  "plugins": [
+    "react"
+  ],
+  "rules": {
+    "indent": "off",
+    "no-empty-pattern": "off",
+    "linebreak-style": [
+      "error",
+      "unix"
+    ],
+    "quotes": [
+      "error",
+      "single"
+    ],
+    "semi": [
+      "error",
+      "never"
+    ]
+  },
+  "settings": {
+    "react": {
+      "version": "detect"
+    }
+  }
+}

.gitignore

@@ -21,6 +21,8 @@ env3
 .coverage
 htmlcov
 
+node_modules
+
 build
 dist
 *.egg-info
@@ -29,3 +31,5 @@ dist
 
 .pytest_cache
 .on-save.json
+
+rdmo/management/static

.ignore

@@ -4,3 +4,5 @@ migrations
 
 *.xml
 *.json
+*.po
+*.mo

.nvmrc

@@ -0,0 +1 @@
+18.1.0

CITATION.cff

@@ -4,57 +4,30 @@ authors:
   - family-names: Klar
     given-names:  Jochen
     orcid:        https://orcid.org/0000-0002-5883-4273
+
   - family-names: Michaelis
     given-names:  Olaf
     orcid:        https://orcid.org/0000-0002-5282-703X
-  - family-names: Engelhardt
-    given-names:  Claudia
-    orcid:        https://orcid.org/0000-0002-3391-7638
-  - family-names: Enke
-    given-names:  Harry
+
+  - family-names: Wallace
+    given-names:  David
+    orcid:        https://orcid.org/0000-0001-8958-4601
+
+  - family-names: Schröder
+    given-names:  Max
+    orcid:        https://orcid.org/0000-0003-1522-494X
+
+  - given-names:  Harry
+    given-names:  Enke
     orcid:        https://orcid.org/0000-0002-2366-8316
-  - family-names: Frenzel
-    given-names:  Johannes
-    orcid:        https://orcid.org/0000-0003-0458-5424
-  - family-names: Hausen
-    given-names:  Daniela
-    orcid:        https://orcid.org/0000-0001-9083-0670
-  - family-names: Jagusch
-    given-names:  Gerald
-    orcid:        https://orcid.org/0000-0001-9964-1112
-  - family-names: Kramer
-    given-names:  Claudia
-    orcid:        https://orcid.org/0000-0001-9355-857X
-  - family-names: Lindstädt
-    given-names:  Birte
-    orcid:        https://orcid.org/0000-0002-8251-1597
-  - family-names: Ludwig
-    given-names:  Jens
-    orcid:        https://orcid.org/0000-0002-2998-1696
-  - family-names: Heike
-    given-names:  Neuroth
-    orcid:        https://orcid.org/0000-0003-4925-7248
-  - family-names: Straka
-    given-names:  Janine
-    orcid:        https://orcid.org/0000-0002-0695-1689
-  - family-names: Strötgen
-    given-names:  Robert
-    orcid:        https://orcid.org/0000-0003-3320-5187
-  - family-names: Ulrich
-    given-names:  Robert
-    orcid:        https://orcid.org/0000-0001-9063-2703
-  - family-names: Wedlich-Zachodin
-    given-names:  Kerstin
-    orcid:        https://orcid.org/0000-0001-7740-7966
-  - family-names: Wuttke
-    given-names:  Ulrike
-    orcid:        https://orcid.org/0000-0002-8217-4025
+
   - family-names: Lanza
     given-names:  Giacomo
     orcid:        https://orcid.org/0000-0002-2239-3955
+
   - family-names: Martínez Muñoz
     given-names:  David
-    orcid:        
+
   - family-names: Pilori
     given-names:  Dario
     orcid:        https://orcid.org/0000-0003-4499-8573

MANIFEST.in

@@ -1,7 +1,9 @@
 graft rdmo
-prune config
+prune rdmo/management/assets
 
 global-exclude __pycache__
 global-exclude *.py[co]
 
+assets
+
 include requirements.txt

conftest.py

@@ -1,10 +1,9 @@
-import os
+import json
 import subprocess
 from pathlib import Path
 
 import pytest
 from django.conf import settings
-from django.contrib.admin.utils import flatten
 from django.core.management import call_command
 
 from rdmo.accounts.utils import set_group_permissions
@@ -13,7 +12,24 @@
 @pytest.fixture(scope='session')
 def django_db_setup(django_db_setup, django_db_blocker):
     with django_db_blocker.unblock():
-        fixtures = flatten([os.listdir(fixture_dir) for fixture_dir in settings.FIXTURE_DIRS])
+        fixtures = []
+        for fixture_dir in settings.FIXTURE_DIRS:
+            for file in Path(fixture_dir).iterdir():
+                if file.stem in [
+                    'accounts',
+                    'conditions',
+                    'domain',
+                    'groups',
+                    'options',
+                    'overlays',
+                    'projects',
+                    'questions',
+                    'sites',
+                    'tasks',
+                    'users',
+                    'views'
+                ]:
+                    fixtures.append(file)
 
         call_command('loaddata', *fixtures)
         set_group_permissions()
@@ -27,3 +43,12 @@ def setup():
 
     setup()
     return setup
+
+
+@pytest.fixture
+def json_data():
+    json_file = Path(settings.BASE_DIR) / 'import' / 'catalogs.json'
+    json_data = {
+        'elements': json.loads(json_file.read_text())
+    }
+    return json_data

docs/dev.md

@@ -115,7 +115,30 @@ cp -r ../rdmo/testing/media media_root       # on Linux or macOS
 xcopy ..\rdmo\testing\media media_root /e/s  # on Windows
 ```
 
-Now the development server can be started using:
+Starting from RDMO `1.10.0` we use [webpack](https://webpack.js.org/) to bundle the new React based front-end. For this [nodejs](https://nodejs.org) needs to be available. The preferred way is to use [nvm.sh](https://github.com/nvm-sh/nvm). It can be installed for the current user with:
+
+```
+wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.3/install.sh | bash
+```
+
+After the installation add:
+
+```
+export NVM_DIR="$HOME/.nvm"
+[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
+[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"
+```
+
+to your `.bashrc`. Then run:
+
+```
+nvm install    # only once, to install the node version given in .nvmrc
+nvm use        # to activate the node version
+npm install    # to install the many, many javascript dependencies
+npm run watch  # to build the front-end and rebuild it when changing the source
+```
+
+Now the development server can be started (in a different terminal) using:
 
 ```
 python manage.py runserver

docs/i18n.md

@@ -5,13 +5,14 @@ To update the locale files, change to the `rdmo` directory **inside** the `rdmo`
 
 ```bash
 django-admin makemessages -a
+django-admin makemessages -a -d djangojs
 ```
 
 Then, edit the `.po` files in the `locale` directory. This is can be done using [Poedit](https://poedit.net), e.g.
 
 ```bash
 poedit locale/de/LC_MESSAGES/django.po
-poedit locale/fr/LC_MESSAGES/django.po
+poedit locale/de/LC_MESSAGES/djangojs.po
 ```
 
 Afterwards run

docs/releases.md

@@ -7,31 +7,38 @@ Releases
 
 2) Update version in `rdmo/__init__.py`.
 
-3) Build `sdist` and `bdist_wheel`:
+3) Build production front-end files
+
+  ```
+  nvm use
+  npm install
+  npm run build:prod
+  ```
+
+4) Build `sdist` and `bdist_wheel`:
 
   ```
   python setup.py sdist bdist_wheel
   ```
 
-4) Upload with `twine` to Test PyPI:
+5) Upload with `twine` to Test PyPI:
 
   ```
-  twine upload --repository-url https://test.pypi.org/legacy/ dist/*
   twine upload -r testpypi dist/*
   ```
 
-5) Check https://test.pypi.org/project/rdmo/.
+6) Check https://test.pypi.org/project/rdmo/.
 
-6) Upload with `twine` to PyPI:
+7) Upload with `twine` to PyPI:
 
   ```
   twine upload dist/*
   ```
 
-7) Check https://pypi.org/project/rdmo/.
+8) Check https://pypi.org/project/rdmo/.
 
-8) Commit local changes.
+9) Commit local changes.
 
-9) Push changes.
+10) Push changes.
 
-10) Create release on [GitHub](https://github.com/rdmorganiser/rdmo/releases).
+11) Create release on [GitHub](https://github.com/rdmorganiser/rdmo/releases).

docs/testing.md

@@ -25,6 +25,7 @@ python --reuse-db                                               # keep the datab
 pytest rdmo/domain                                              # test only the domain app
 pytest rdmo/domain/tests/test_viewsets.py                       # run only a specific test file
 pytest rdmo/domain/tests/test_viewsets.py::test_attribute_list  # run only a specific test
+pytest -k 'test_validator'                                      # run only set of test files, using substring matching
 ```
 
 Coverage