Application Quality Backend of 2.0.0-rc4

backend/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.13.3-slim
+FROM python:3.13.9-slim
 
 WORKDIR /app
 

backend/application_quality/settings.py

@@ -12,6 +12,8 @@
 import os
 
 from pathlib import Path
+from urllib.parse import urlparse
+
 
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
 BASE_DIR = Path(__file__).resolve().parent.parent
@@ -54,7 +56,23 @@
     },
 }
 
-ALLOWED_HOSTS = ["*"]
+# Build the ALLOWED_HOSTS variable
+
+# PUBLIC_URL should contain a scheme, and possibly a port number
+allowed_host = os.getenv("PUBLIC_URL")
+if "://" not in allowed_host:
+    allowed_host = "http://" + allowed_host
+parsed_allowed_host = urlparse(allowed_host)
+allowed_domain = parsed_allowed_host.netloc
+if ":" in allowed_domain:
+    # Remove the port number, if any
+    allowed_domain = allowed_domain.split(":")[0]
+
+ALLOWED_HOSTS = [allowed_domain]
+add_hosts_raw = os.getenv("ADDITIONAL_ALLOWED_HOSTS")
+if add_hosts_raw:
+    add_hosts_list = [host.strip() for host in add_hosts_raw.split(',') if host.strip()]
+    ALLOWED_HOSTS.extend(add_hosts_list)
 
 
 # Application definition
@@ -71,6 +89,7 @@
     "corsheaders",
     "backend",
     "mozilla_django_oidc",
+    "django_svelte_jsoneditor",  # See SVELTE_JSONEDITOR_PROPS, below
 ]
 
 MIDDLEWARE = [
@@ -150,6 +169,25 @@
 ]
 
 
+# svelte-jsoneditor default properties for all widgets rendered in the app.
+# See: https://django-svelte-jsoneditor.readthedocs.io/en/latest/settings.html
+
+SVELTE_JSONEDITOR_PROPS = {
+    # Just the subset to customize:
+    "mode": "tree",
+    "mainMenuBar": True,
+    "navigationBar": True,
+    "statusBar": True,
+    "askToFormat": True,
+    "readOnly": False,
+    "indentation": 4,
+    "tabSize": 4,
+    "escapeControlCharacters": False,
+    "escapeUnicodeCharacters": False,
+    "flattenColumns": True,
+}
+
+
 # Internationalization
 # https://docs.djangoproject.com/en/5.1/topics/i18n/
 
@@ -225,9 +263,8 @@
 
 
 CORS_ORIGIN_ALLOW_ALL = True
-CORS_ALLOWED_ORIGINS = [os.getenv("PUBLIC_URL")]  # Frontend URL
-
 CORS_ALLOW_HEADERS = "*"
+CORS_ALLOWED_ORIGINS = [os.getenv("PUBLIC_URL")]  # Frontend URL
 
 #CSRF_COOKIE_SECURE = False
 #CSRF_USE_SESSIONS = True

backend/backend/admin.py

@@ -1,20 +1,42 @@
-from django.contrib import admin
 from backend import models
 
+from django.contrib import admin
+from django.db.models import JSONField
+# https://django-svelte-jsoneditor.readthedocs.io/en/latest/index.html
+# Customised using SVELTE_JSONEDITOR_PROPS in the Django settings
+from django_svelte_jsoneditor.widgets import SvelteJSONEditorWidget
+
+
+
 class PipelineSettings(admin.ModelAdmin):
     list_display = ("name", "description", "owner", "version", "created_at", "edited_at")
+    formfield_overrides = {
+        JSONField: {"widget": SvelteJSONEditorWidget}
+    }
 
 class PipelineRunSettings(admin.ModelAdmin):
     list_display = ("__str__", "pipeline", "start_time", "completion_time", "status", "user", "started_by")
+    formfield_overrides = {
+        JSONField: {"widget": SvelteJSONEditorWidget}
+    }
 
 class ToolSettings(admin.ModelAdmin):
-    list_display = ("slug", "name", "version")
+    list_display = ("slug", "name", "version", "status", "available")
+    formfield_overrides = {
+        JSONField: {"widget": SvelteJSONEditorWidget}
+    }
 
 class CommandSettings(admin.ModelAdmin):
     list_display = ("slug", "name", "version")
+    formfield_overrides = {
+        JSONField: {"widget": SvelteJSONEditorWidget}
+    }
 
 class JobReportSettings(admin.ModelAdmin):
     list_display = ("__str__", "name", "created_at")
+    formfield_overrides = {
+        JSONField: {"widget": SvelteJSONEditorWidget}
+    }
 
 admin.site.register(models.Pipeline, PipelineSettings)
 admin.site.register(models.PipelineRun, PipelineRunSettings)