updated taxonomy to comply with new panel classes

Author: Ross-Clark

.dockerignore

@@ -0,0 +1,26 @@
+**/__pycache__
+**/.venv
+**/.classpath
+**/.dockerignore
+**/.git
+**/.gitignore
+**/.project
+**/.settings
+**/.toolstarget
+**/.vs
+**/.vscode
+**/*.*proj.user
+**/*.dbmdl
+**/*.jfm
+**/bin
+**/charts
+**/docker-compose*
+**/compose*
+**/Dockerfile*
+**/node_modules
+**/npm-debug.log
+**/obj
+**/secrets.dev.yaml
+**/values.dev.yaml
+LICENSE
+README.md

pyproject.toml

@@ -14,9 +14,9 @@ description = "Add React Taxonomy component to a wagtail page and store it as a
 classifiers = [
     "Environment :: Web Environment",
     "Framework :: Django",
-    "Framework :: Django :: 2.2",
+    "Framework :: Django :: 4.0",
     "Framework :: Wagtail",
-    "Framework :: Wagtail :: 2",
+    "Framework :: Wagtail :: 3",
     "Intended Audience :: Developers",
     "License :: OSI Approved :: MIT License",
     "Operating System :: OS Independent",

requirements.txt

@@ -1,5 +1,5 @@
 Django~=4.0
-wagtail~=3.0
+wagtail~=3.0.3
 psycopg2-binary>=<2.9.6 
 python-crontab>=2.5,<2.6
 django-cors-headers>=3.5,<3.6

test_page/management/commands/load_test_data_fixtures.py

@@ -38,3 +38,4 @@ def handle(self, *args, **options):
             except Page.DoesNotExist:
                 pass
             self.stdout.write(self.style.SUCCESS('DONE'))
+            self.stdout.write(self.style.NOTICE('run python3 ./manage.py fixtree'))

wagtailreacttaxonomy/panels.py

@@ -2,39 +2,15 @@
 
 from django.template.loader import render_to_string
 from django.utils.safestring import mark_safe
+from django.core.exceptions import ImproperlyConfigured
 
-from wagtail.admin.panels import FieldPanel
+from wagtail.admin.panels import FieldPanel,EditHandler
 
 from .models import TaxonomyTerms
 
 
 class TaxonomyPanel(FieldPanel):
-    object_template = "wagtailadmin/panels/taxonomy_panel.html"
-    field_template = "wagtailadmin/panels/taxonomy_panel.html"
 
-    def render_as_object(self):
-        return mark_safe(render_to_string(self.object_template, {
-            'self': self,
-            self.TEMPLATE_VAR: self,
-            'field': self.bound_field,
-            'taxonomy_terms_json': self.load_taxonomy_terms(),
-            'taxonomy_terms_error_message': self.taxonomy_terms_error_message,
-        }))
-    
-    def load_taxonomy_terms(self):
-        taxonomy_terms_json = None
-        try:
-            data = TaxonomyTerms.objects.get(taxonomy_id=self.taxonomy_terms_id)
-            try:
-                json.loads(data.terms_json)
-            except json.decoder.JSONDecodeError:
-                self.taxonomy_terms_error_message = '"Taxonomy Terms" json wrong format'
-            taxonomy_terms_json = data.terms_json
-        except TaxonomyTerms.DoesNotExist:
-            self.taxonomy_terms_error_message = 'No "Taxonomy Terms" for this id: "{}"'.format(
-                self.taxonomy_terms_id
-            )
-        return taxonomy_terms_json
 
     def __init__(self, field_name, taxonomy_terms_id, *args, **kwargs):
         super().__init__(field_name, *args, **kwargs)
@@ -49,6 +25,61 @@ def clone_kwargs(self):
             widget=self.widget if hasattr(self, 'widget') else None,
         )
         return kwargs
+    
+    def get_bound_panel(self, instance=None, request=None, form=None ):
+
+        if self.model is None:
+            raise ImproperlyConfigured(
+                "%s.bind_to_model(model) must be called before get_bound_panel"
+                % type(self).__name__
+            )
+
+        if not issubclass(self.BoundPanel, EditHandler.BoundPanel):
+            raise ImproperlyConfigured(
+                "%s.BoundPanel must be a subclass of EditHandler.BoundPanel"
+                % type(self).__name__
+            )
+
+        
+        return self.BoundPanel(
+            panel=self, instance=instance, request=request, form=form, taxonomy_terms_id=self.taxonomy_terms_id
+        )
+    
+    class BoundPanel(FieldPanel.BoundPanel):
+
+        object_template = "wagtailadmin/panels/taxonomy_panel.html"
+        field_template = "wagtailadmin/panels/taxonomy_panel.html"
+
+        def load_taxonomy_terms(self):
+            taxonomy_terms_json = None
+            try:
+                data = TaxonomyTerms.objects.get(taxonomy_id=self.taxonomy_terms_id)
+                try:
+                    json.loads(data.terms_json)
+                except json.decoder.JSONDecodeError:
+                    self.taxonomy_terms_error_message = '"Taxonomy Terms" json wrong format'
+                taxonomy_terms_json = data.terms_json
+            except TaxonomyTerms.DoesNotExist:
+                self.taxonomy_terms_error_message = 'No "Taxonomy Terms" for this id: "{}"'.format(
+                    self.taxonomy_terms_id
+                )
+            return taxonomy_terms_json
+
+        def __init__(self, panel, instance, request, form, taxonomy_terms_id):
+            super().__init__(panel=panel, instance=instance, request=request, form=form)
+            self.taxonomy_terms_id = taxonomy_terms_id
+            self.taxonomy_terms_error_message = None
+
+        def render_as_object(self):
+            return mark_safe(
+                render_to_string(
+                self.object_template, {
+                    'self': self,
+                    self.panel.TEMPLATE_VAR: self,
+                    'field': self.bound_field,
+                    'taxonomy_terms_json': self.load_taxonomy_terms(),
+                    'taxonomy_terms_error_message': self.taxonomy_terms_error_message,
+            }))
 
 
 class PermissionsPanel(FieldPanel):