Merge branch 'main' into maintainance/django-4x

.editorconfig

@@ -10,6 +10,9 @@ indent_style = space
 insert_final_newline = true
 trim_trailing_whitespace = true
 
+[*.{yml,yaml,json}]
+indent_size = 2
+
 [*.md]
 trim_trailing_whitespace = false
 

.eslintrc.yaml

@@ -1,56 +1,52 @@
-extends: eslint:recommended
+extends:
+  - eslint:recommended
+  - prettier
 env:
   browser: true
   commonjs: true
   es6: true
+
+ignorePatterns:
+  - "*.min.js"
+  - "**/esm/*.js"
+
 globals:
   jQuery: true
 rules:
   array-bracket-spacing:
-  - "error"
-  - never
+    - "error"
+    - never
   block-scoped-var: "error"
-  brace-style:
-  - "error"
-  - stroustrup
-  - allowSingleLine: true
-  comma-dangle:
-  - "error"
-  - never
   comma-spacing: "error"
   comma-style:
-  - "error"
-  - last
+    - "error"
+    - last
   computed-property-spacing:
-  - "error"
-  - never
+    - "error"
+    - never
   curly:
-  - "error"
-  - all
+    - "error"
+    - all
   eol-last: "error"
   eqeqeq:
-  - "error"
-  - smart
+    - "error"
+    - smart
   guard-for-in: "error"
-  indent:
-  - "error"
-  - 4
-  - SwitchCase: 1
   key-spacing:
-  - "error"
-  - beforeColon: false
-    afterColon: true
+    - "error"
+    - beforeColon: false
+      afterColon: true
   keyword-spacing:
-  - "error"
-  - before: true
-    after: true
+    - "error"
+    - before: true
+      after: true
   linebreak-style:
-  - "error"
-  - unix
+    - "error"
+    - unix
   lines-around-comment:
-  - "error"
-  - beforeBlockComment: true
-    afterBlockComment: false
+    - "error"
+    - beforeBlockComment: true
+      afterBlockComment: false
   new-parens: "error"
   no-array-constructor: "error"
   no-caller: "error"
@@ -59,8 +55,8 @@ rules:
   no-extend-native: "error"
   no-extra-bind: "error"
   no-extra-parens:
-  - "error"
-  - functions
+    - "error"
+    - functions
   no-implied-eval: "error"
   no-iterator: "error"
   no-label-var: "error"
@@ -87,60 +83,50 @@ rules:
   no-undefined: "error"
   no-unused-expressions: "error"
   no-unused-vars:
-  - "error"
-  - vars: all
-    args: none
+    - "error"
+    - vars: all
+      args: none
   no-with: "error"
-  object-curly-spacing:
-  - "error"
-  - never
   one-var:
-  - "error"
-  - never
-  quote-props:
-  - "error"
-  - consistent-as-needed
-  quotes:
-  - "error"
-  - single
-  - avoid-escape
+    - "error"
+    - never
   semi:
-  - "error"
-  - always
+    - "error"
+    - always
   semi-spacing:
-  - "error"
-  - before: false
-    after: true
+    - "error"
+    - before: false
+      after: true
   space-before-blocks:
-  - "error"
-  - always
+    - "error"
+    - always
   space-before-function-paren:
-  - "error"
-  - anonymous: always
-    named: never
+    - "error"
+    - anonymous: always
+      named: never
   space-in-parens:
-  - "error"
-  - never
+    - "error"
+    - never
   space-infix-ops: "error"
   space-unary-ops:
-  - "error"
-  - words: true
-    nonwords: false
+    - "error"
+    - words: true
+      nonwords: false
   spaced-comment:
-  - "error"
-  - always
+    - "error"
+    - always
   strict:
-  - "error"
-  - function
+    - "error"
+    - function
   yoda:
-  - "error"
-  - never
+    - "error"
+    - never
   max-nested-callbacks:
-  - "warn"
-  - 3
+    - "warn"
+    - 3
   valid-jsdoc:
-  - "warn"
-  - prefer:
-      returns: return
-      property: prop
-    requireReturn: false
+    - "warn"
+    - prefer:
+        returns: return
+        property: prop
+      requireReturn: false

.github/release-drafter.yml

@@ -1,44 +1,44 @@
-name-template: '$RESOLVED_VERSION'
-tag-template: 'v$RESOLVED_VERSION'
+name-template: "$RESOLVED_VERSION"
+tag-template: "v$RESOLVED_VERSION"
 version-resolver:
   major:
     labels:
-      - 'Type: Major'
-      - 'major'
+      - "Type: Major"
+      - "major"
   minor:
     labels:
-      - 'Type: Minor'
-      - 'minor'
+      - "Type: Minor"
+      - "minor"
   patch:
     labels:
-      - 'Type: Patch'
-      - 'patch'
+      - "Type: Patch"
+      - "patch"
   default: patch
 categories:
-  - title: '🚀 Features'
-    labels:
-      - 'Type: Feature'
-      - 'feature'
-  - title: '⚙️ Enhancements'
-    labels:
-      - 'Type: Enhancement'
-      - 'enhancement'
-  - title: '🐛 Bug Fixes'
-    labels:
-      - 'Type: Bug'
-      - 'fix'
-      - 'bugfix'
-      - 'bug'
-  - title: '🔧 Maintenance'
-    labels:
-      - 'Type: Maintenance'
-      - 'Type: Dependencies'
-      - 'dependencies'
-      - 'maintenance'
-  - title: '📜 Documentation'
-    labels:
-      - 'Type: Documentation'
-      - 'documentation'
+  - title: "🚀 Features"
+    labels:
+      - "Type: Feature"
+      - "feature"
+  - title: "⚙️ Enhancements"
+    labels:
+      - "Type: Enhancement"
+      - "enhancement"
+  - title: "🐛 Bug Fixes"
+    labels:
+      - "Type: Bug"
+      - "fix"
+      - "bugfix"
+      - "bug"
+  - title: "🔧 Maintenance"
+    labels:
+      - "Type: Maintenance"
+      - "Type: Dependencies"
+      - "dependencies"
+      - "maintenance"
+  - title: "📜 Documentation"
+    labels:
+      - "Type: Documentation"
+      - "documentation"
 template: |
   ## Changes
 

.github/workflows/codeql-analysis.yml

@@ -14,25 +14,25 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ main, test ]
+    branches: [main, test]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ main ]
+    branches: [main]
 
 jobs:
   analyze:
     name: Analyze
     runs-on: ubuntu-latest
 
     steps:
-    - name: Checkout repository
-      uses: actions/checkout@v3
+      - name: Checkout repository
+        uses: actions/checkout@v3
 
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
-      with:
-        languages: javascript, python
+      # Initializes the CodeQL tools for scanning.
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v2
+        with:
+          languages: javascript, python
 
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v2

.github/workflows/deploy-docs.yml

@@ -5,8 +5,8 @@ on:
     branches:
       - main
     paths:
-      - 'docs/**'
-      - 'mkdocs.yml'
+      - "docs/**"
+      - "mkdocs.yml"
 
 concurrency:
   group: deploy

.github/workflows/hypha-ci.yml

@@ -1,4 +1,3 @@
-
 name: Hypha CI
 
 on:
@@ -16,7 +15,7 @@ concurrency:
 
 env:
   NODE_VERSION: 18
-  PYTHON_VERSION: '3.11'
+  PYTHON_VERSION: "3.11"
 
 jobs:
   build-fe:
@@ -26,7 +25,7 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: ${{ env.NODE_VERSION }}
-          cache: 'npm'
+          cache: "npm"
       - name: install node dependencies
         run: npm install --quiet
       - name: builds static assets
@@ -41,8 +40,8 @@ jobs:
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
-          cache: 'pip'
-          cache-dependency-path: '**/requirements*.txt'
+          cache: "pip"
+          cache-dependency-path: "**/requirements*.txt"
       - name: install python dependencies
         run: |
           python3 -m venv venv
@@ -58,7 +57,7 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: ${{ env.NODE_VERSION }}
-          cache: 'npm'
+          cache: "npm"
       - name: install node dependencies
         run: npm install --quiet
       - name: run scss and js linting
@@ -72,9 +71,13 @@ jobs:
         with:
           python-version: ${{ env.PYTHON_VERSION }}
       - name: Install python dependencies
-        run: pip install `grep "ruff" requirements-dev.txt`
-      - name: Run python linting
+        run: pip install `grep -E "ruff|djhtml|black" requirements-dev.txt`
+      - name: Run ruff
         run: ruff --format github .
+      - name: Run black
+        run: black . --check
+      - name: Run djhtml
+        run: djhtml hypha/ --check
 
   test-be:
     runs-on: ubuntu-latest
@@ -100,8 +103,8 @@ jobs:
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
-          cache: 'pip'
-          cache-dependency-path: '**/requirements*.txt'
+          cache: "pip"
+          cache-dependency-path: "**/requirements*.txt"
       - uses: codecov/codecov-action@v3
       - name: install python dependencies
         run: |