Working solution

Author: marcoacierno

.gitignore

@@ -137,3 +137,4 @@ backend/schema.graphql
 backend/__pypackages__/
 backend/custom_admin/.astro/
 backend/custom_admin/core.*
+core.*

backend/custom_admin/context_processors.py

@@ -3,10 +3,3 @@
 
 def admin_settings(request):
     return {"CURRENT_ENV": settings.ENVIRONMENT}
-
-
-def astro_settings(request):
-    return {
-        "ASTRO_URL": request.build_absolute_uri("/astro"),
-        "APOLLO_GRAPHQL_URL": "/admin/graphql",
-    }

backend/custom_admin/src/components/shared/rich-editor/index.tsx

@@ -1,10 +1,10 @@
-import { Card } from "@radix-ui/themes";
 import { Color } from "@tiptap/extension-color";
 import ListItem from "@tiptap/extension-list-item";
 import TextAlign from "@tiptap/extension-text-align";
 import TextStyle from "@tiptap/extension-text-style";
 import { EditorContent, useEditor } from "@tiptap/react";
 import StarterKit from "@tiptap/starter-kit";
+import clsx from "clsx";
 import { MenuBar } from "./menu-bar";
 
 const extensions = [
@@ -28,9 +28,11 @@ const extensions = [
 export const RichEditor = ({
   content,
   onUpdate,
+  className,
 }: {
   content: string;
   onUpdate: (content: string) => void;
+  className?: string;
 }) => {
   const editor = useEditor({
     extensions,
@@ -40,7 +42,7 @@ export const RichEditor = ({
     },
     editorProps: {
       attributes: {
-        class: "outline-none",
+        class: clsx("outline-none", className),
       },
     },
   });

backend/custom_admin/src/components/widgets/rich-editor.tsx

@@ -10,6 +10,7 @@ export const RichEditorWidget = ({ name, value }) => {
       <RichEditor
         content={value}
         onUpdate={(content) => setUpdatedValue(content)}
+        className="[&>*]:!text-base"
       />
 
       <input type="hidden" name={name} value={updatedValue} />

backend/custom_admin/src/pages/widgets/rich-editor.astro

@@ -5,4 +5,4 @@ import { RichEditorWidget } from "../../components/widgets/rich-editor";
 ---
 
 
-<RichEditorWidget name="{{widget.name|escapejs}}" value="{{widget.value|escapejs}}" client:only />
+<RichEditorWidget name="{{widget.name|escapejs}}" value="{{widget.value|empty_string_if_none|escapejs}}" client:only />

backend/custom_admin/template_backends.py

@@ -1,3 +1,4 @@
+from functools import cached_property
 import requests
 from django.template.backends.django import (
     DjangoTemplates,
@@ -54,6 +55,7 @@ def get_template(self, template_name):
 
         text = _proxy_to_astro(template_name)
 
+        # form renderer and django template renderer have some differences
         if hasattr(self, "from_string"):
             return self.from_string(text)
 
@@ -67,15 +69,30 @@ def __init__(self, *args, **kwargs):
         astro_loader_path = "custom_admin.template_backends.AstroContentLoader"
 
         if settings.DEBUG:
+            # in debugging we don't want to cache the content
+            # so we put the astro loader first
             self.engine.loaders = [astro_loader_path] + self.engine.loaders
         else:
             # When running in production, put the astro loader
-            # in the Cached loader
+            # in the Cached loader so we don't read the file every time
+            # structure is: (cached_loader, [astro_loader, ... other loaders])
             self.engine.loaders[0] = (
                 self.engine.loaders[0][0],
                 [astro_loader_path] + self.engine.loaders[0][1],
             )
 
 
 class FormRenderer(GetTemplate, FormsDjangoTemplates):
-    ...
+    @cached_property
+    def engine(self):
+        # Ugly hack because the form renderer is hardcoded here:
+        # https://github.com/django/django/blob/fcd9d08379a2aee3b2c49eab0d0b8db6fd66d091/django/forms/renderers.py#L43
+        # So we need to override the engine property to include the builtins
+        engine = super().engine
+        engine.engine.builtins = (
+            engine.engine.builtins + settings.TEMPLATES[0]["OPTIONS"]["builtins"]
+        )
+        engine.engine.template_builtins = engine.engine.get_template_builtins(
+            engine.engine.builtins
+        )
+        return engine

backend/custom_admin/templates/admin/pycon_base.html

@@ -20,6 +20,10 @@
     width: 9px;
     height: 6px;
   }
+
+  p {
+    line-height: var(--default-line-height);
+  }
 </style>
 {% endblock extrastyle %} {% block userlinks %}
 <div

backend/custom_admin/templatetags/empty_string_if_none.py

@@ -0,0 +1,8 @@
+from django import template
+
+register = template.Library()
+
+
+@register.filter
+def empty_string_if_none(value):
+    return "" if value is None else value

backend/custom_admin/tests/test_context_processors.py

@@ -1,17 +1,8 @@
-from custom_admin.context_processors import admin_settings, astro_settings
+from custom_admin.context_processors import admin_settings
 
 
 def test_admin_settings(settings, rf):
     settings.ENVIRONMENT = "test"
 
     output = admin_settings(rf.get("/"))
     assert output == {"CURRENT_ENV": "test"}
-
-
-def test_astro_settings(rf):
-    request = rf.get("/")
-    output = astro_settings(request)
-    assert output == {
-        "ASTRO_URL": "http://testserver/astro",
-        "APOLLO_GRAPHQL_URL": "/admin/graphql",
-    }

backend/notifications/admin/admins.py

@@ -53,10 +53,10 @@ class EmailTemplateAdmin(ConferencePermissionMixin, admin.ModelAdmin):
 
     def formfield_for_dbfield(self, db_field, **kwargs):
         if db_field.name == "body":
-            kwargs["widget"] = RichEditorWidget(attrs={"rows": 50, "cols": 200})
+            kwargs["widget"] = RichEditorWidget()
 
         if db_field.name in ("subject", "preview_text"):
-            kwargs["widget"] = RichEditorWidget(attrs={"rows": 2, "cols": 200})
+            kwargs["widget"] = Textarea(attrs={"rows": 2, "cols": 200})
 
         return super().formfield_for_dbfield(db_field, **kwargs)