RDMO 3.0.0 🌠

.eslintrc.js

@@ -22,24 +22,117 @@ module.exports = {
     'sourceType': 'module'
   },
   'plugins': [
+    'simple-import-sort',
     'react'
   ],
   'ignorePatterns': ['**/static/**/*.js'],
   'rules': {
-    'indent': 'off',
+    // Disable unused rules
     'no-empty-pattern': 'off',
-    'linebreak-style': [
+
+    // Unix linebreaks only
+    'linebreak-style': ['error', 'unix'],
+
+    // Single quotes, allow double to avoid escaping
+    'quotes': [
       'error',
-      'unix'
+      'single',
+      { 'avoidEscape': true }
     ],
-    'quotes': [
+
+    // No semicolons
+    'semi': ['error', 'never'],
+
+    // Maximum line length of 120 characters
+    'max-len': [
+      'error',
+      {
+        'code': 120,
+        'ignoreUrls': true,
+        'ignoreRegExpLiterals': true
+      }
+    ],
+
+    // Indent by 2 spaces
+    'indent': ['error', 2, {
+      'SwitchCase': 1,
+    }],
+
+    // Enforce spaces around =, +, ==, ?, :, etc.
+    'space-infix-ops': 'error',
+
+    // Enforce separate const declarations
+    'one-var': ['error', 'never'],
+
+    // Ensure spaces after commas
+    'comma-spacing': ['error', { before: false, after: true }],
+
+    // Disallow newlines between the operands of a ternary expression
+    'multiline-ternary': ['error', 'never'],
+
+    // Ensure correct multiline imports
+    'object-curly-newline': ['error', {
+      multiline: true,
+      consistent: true
+    }],
+
+    // Import order
+    'simple-import-sort/imports': ['error', {
+      groups: [
+        // external imports in the given order
+        ['^react$', '^prop-types$', '^react', '^redux', '^[a-z]', '^lodash'],
+        // rdmo imports: lowercase first, then capitalized components
+        ['^rdmo/.*\\/[a-z]'],
+        ['^rdmo/.*\\/[A-Z]'],
+        // parent imports: lowercase first, then capitalized components
+        ['^\\.\\..*\\/[a-z]'],
+        ['^\\.\\..*\\/[A-Z]'],
+        // sibling imports: lowercase first, then capitalized  components
+        ['^\\./.*\\/[a-z]'],
+        ['^\\./.*\\/[A-Z]'],
+      ],
+    }],
+
+    // Export order
+    'simple-import-sort/exports': 'error',
+
+    // JSX: require a newline before the first prop when the JSX spans multiple lines and there is more than one prop
+    'react/jsx-first-prop-new-line': ['error', 'multiline-multiprop'],
+
+    // JSX: wrap multiline expressions in parens, opening paren on a new line
+    'react/jsx-wrap-multilines': [
       'error',
-      'single'
+      {
+        'declaration': 'parens-new-line',
+        'assignment': 'parens-new-line',
+        'return': 'parens-new-line',
+        'arrow': 'parens-new-line',
+        'condition': 'parens-new-line',
+        'logical': 'parens-new-line',
+        'prop': 'parens-new-line'
+      }
     ],
-    'semi': [
+
+    // JSX curly braces: require newlines inside for multiline expressions
+    'react/jsx-curly-newline': [
       'error',
-      'never'
-    ]
+      {
+        'multiline': 'require',
+        'singleline': 'consistent'
+      }
+    ],
+
+    // JSX curly brace spacing: no spaces inside { }
+    'react/jsx-curly-spacing': [
+      'error',
+      {
+        'when': 'never',
+        'children': true
+      }
+    ],
+
+    // JSX double quotes for props
+    'jsx-quotes': ['error', 'prefer-double'],
   },
   'settings': {
     'react': {

.github/workflows/ci.yml

@@ -151,8 +151,20 @@ jobs:
     - run: mkdir screenshots
     - name: Collect static files into static root (only required if rdmo is installed from wheel)
       run: python testing/manage.py collectstatic --noinput
+    - name: Verify installed wheel package and asset origins for CI
+      continue-on-error: true
+      run: |
+        python -I -c 'import rdmo; print("isolated Python:", rdmo.__file__)'
+        python testing/manage.py shell -c 'import rdmo; print("manage.py:", rdmo.__file__)'
+        pytest rdmo/*/tests -m ci \
+          -p randomly -p no:cacheprovider -s -q --nomigrations
+      env:
+        DJANGO_DEBUG: True
+        GITHUB_DB_BACKEND: ${{ matrix.db-backend }}
     - name: Run end-to-end tests
-      run: pytest -p randomly -p no:cacheprovider --reuse-db --numprocesses=auto --dist=loadscope -m e2e --nomigrations
+      run: |
+        pytest -p randomly -p no:cacheprovider --reuse-db --numprocesses=auto --dist=loadscope \
+          -m e2e --nomigrations
       env:
         DJANGO_DEBUG: True
         GITHUB_DB_BACKEND: ${{ matrix.db-backend }}

.gitignore

@@ -34,18 +34,8 @@ dist
 .ruff_cache
 .on-save.json
 
+rdmo/core/static
 rdmo/management/static
+rdmo/projects/static
 
-rdmo/core/static/core/js/base.js
-rdmo/core/static/core/js/base.js.LICENSE.txt
-rdmo/core/static/core/css/base.css
-rdmo/core/static/core/fonts
-
-rdmo/projects/static/projects/css/interview.css
-rdmo/projects/static/projects/css/projects.css
-rdmo/projects/static/projects/fonts/
-rdmo/projects/static/projects/js/interview.js
-rdmo/projects/static/projects/js/interview.js.LICENSE.txt
-rdmo/projects/static/projects/js/projects.js
-rdmo/projects/static/projects/js/projects.js.LICENSE.txt
 screenshots

.pre-commit-config.yaml

@@ -37,6 +37,7 @@ repos:
         additional_dependencies:
           - eslint@8.56.0
           - eslint-plugin-react@7.37.0
+          - eslint-plugin-simple-import-sort@12.1.1
           - react@18.3.1
   - repo: https://github.com/crate-ci/typos
     rev: 37bb98842b0d8c4ffebdb75301a13db0267cef89  # frozen: v1.47.2

conftest.py

@@ -21,7 +21,6 @@ def fixtures():
         'domain',
         'groups',
         'options',
-        'overlays',
         'projects',
         'questions',
         'sites',
@@ -41,6 +40,7 @@ def django_db_setup(django_db_setup, django_db_blocker, fixtures):
     """Populate database with test data from fixtures directories."""
     with django_db_blocker.unblock():
         call_command('loaddata', *fixtures)
+        call_command('rebuild_mptt')
         set_group_permissions()
 
 

package.json

@@ -5,7 +5,7 @@
     "build:prod": "webpack --config webpack.config.js --mode production",
     "build": "webpack --config webpack.config.js --mode development",
     "watch": "webpack --config webpack.config.js --mode development --watch",
-    "lint": "eslint --ext .js rdmo/"
+    "lint": "eslint rdmo/**/*.js"
   },
   "author": "RDMO Arbeitsgemeinschaft <rdmorganiser.github.io>",
   "license": "Apache-2.0",
@@ -20,7 +20,11 @@
   "dependencies": {
     "@codemirror/lang-html": "^6.4.2",
     "@codemirror/lang-javascript": "^6.2.2",
+    "@fontsource/roboto": "^5.2.10",
+    "@fontsource/roboto-slab": "^5.2.6",
     "@uiw/react-codemirror": "^4.25.1",
+    "bootstrap": "^5.3.3",
+    "bootstrap-icons": "^1.11.3",
     "bootstrap-sass": "^3.4.1",
     "classnames": "^2.5.1",
     "date-fns": "^4.4.0",
@@ -56,6 +60,7 @@
     "css-loader": "^7.1.1",
     "eslint": "^8.56.0",
     "eslint-plugin-react": "^7.37.2",
+    "eslint-plugin-simple-import-sort": "^12.1.1",
     "file-loader": "^6.2.0",
     "mini-css-extract-plugin": "^2.10.2",
     "sass": "^1.99.0",

pyproject.toml

@@ -44,10 +44,8 @@ dependencies = [
   "defusedxml>=0.7.1,<1.0",
   "django>=5.2.8,<6.0",
   "django-cleanup>=8.0,<10.0",
-  "django-compressor>=4.4,<5.0",
   "django-extensions>=3.2,<5.0",
   "django-filter>=23.2,<26.0",
-  "django-libsass>=0.9,<1.0",
   "django-mathfilters>=1.0,<2.0",
   "django-mptt>=0.16.0,<1.0.0",
   "django-settings-export>=1.2,<2.0",
@@ -200,9 +198,10 @@ parametrize-names-type = "csv"
 strict = true
 DJANGO_SETTINGS_MODULE = "config.settings"
 testpaths = ["rdmo/*/tests"]
-pythonpath = [".", "testing"]
-addopts = ["-ra", "-p no:randomly", "-m", "not e2e"]
+pythonpath = ["testing"]
+addopts = ["-ra", "-p no:randomly", "-m", "not e2e and not ci", "--import-mode=importlib"]
 markers = [
+  "ci: marks tests that run only in CI",
   "e2e: marks tests as end-to-end tests using playwright (deselect with '-m \"not e2e\"')",
   "performance: marks query-count regression tests",
 ]
@@ -215,10 +214,16 @@ filterwarnings = [
 ]
 
 [tool.coverage.run]
-source = ["rdmo"]
+source_pkgs = ["rdmo"]
 branch = true
 parallel = true
 
+[tool.coverage.paths]
+source = [
+    "rdmo/",
+    "*/site-packages/rdmo/",
+]
+
 [tool.coverage.report]
 omit = [
     "*/management/commands/*",
@@ -234,6 +239,7 @@ default.extend-ignore-re = [
   "(?Rm)^.*(#|//)\\s*spellchecker:disable-line$", # for .py files
   "(?Rm)^.*<!-- spellchecker:disable-line -->$", # for .html files
 ]
+files.extend-exclude = ["rdmo/core/templates/core/home.html"]
 
 [tool.check-wheel-contents] # Ref: https://github.com/jwodder/check-wheel-contents
 ignore = [