Merge pull request #26 from nhsuk/CV-1119

Cv-1119

.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

README.md

@@ -21,12 +21,12 @@ Useful Imports
 from django.db import models
 from django.db.models.signals import pre_save
 
-from wagtail.admin.edit_handlers import FieldPanel, TabbedInterface, ObjectList, PageChooserPanel
-from wagtail.core.models import Page
+from wagtail.admin.panels import FieldPanel, TabbedInterface, ObjectList, PageChooserPanel
+from wagtail.models import Page
 
 from wagtailreacttaxonomy.models import TaxonomyMixin, PageTaxonomyPermissionsMixin,\
     ModelTaxonomyPermissionsMixin, format_permissions_json
-from wagtailreacttaxonomy.edit_handlers import TaxonomyPanel, PermissionsPanel
+from wagtailreacttaxonomy.panels import TaxonomyPanel, PermissionsPanel
 ```
 
 How to use Taxonomy Term Component

pyproject.toml

@@ -0,0 +1,44 @@
+[build-system]
+requires = [
+    "setuptools>=61.2",
+]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "wagtail-reacttaxonomy"
+version = "0.1"
+authors = [
+    { name = "Yohan Lebret", email = "[email protected]" },
+]
+description = "Add React Taxonomy component to a wagtail page and store it as a json in the db"
+classifiers = [
+    "Environment :: Web Environment",
+    "Framework :: Django",
+    "Framework :: Django :: 4.0",
+    "Framework :: Wagtail",
+    "Framework :: Wagtail :: 3",
+    "Intended Audience :: Developers",
+    "License :: OSI Approved :: MIT License",
+    "Operating System :: OS Independent",
+    "Programming Language :: Python",
+    "Programming Language :: Python :: 3.5",
+    "Programming Language :: Python :: 3.6",
+    "Topic :: Internet :: WWW/HTTP",
+    "Topic :: Internet :: WWW/HTTP :: Dynamic Content",
+]
+
+[project.license]
+text = "MIT"
+
+[project.readme]
+file = "README.md"
+content-type = "text/markdown"
+
+[project.urls]
+Homepage = "https://github.com/nhsuk/wagtail-reacttaxonomy"
+
+[tool.setuptools]
+include-package-data = true
+
+[tool.setuptools.packages.find]
+namespaces = false

requirements.txt

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

test_page/management/commands/load_test_data_fixtures.py

@@ -23,11 +23,11 @@ def handle(self, *args, **options):
         self.no_output = options['no_output']
 
         User = get_user_model()
-        username = os.environ.get('CMS_SUPERUSER_USERNAME', 'superadmin')
+        username = os.environ.get('CMS_SUPERUSER_USERNAME', 'admin')
         if not User.objects.filter(username=username).exists():
             # Create superuser
             self.stdout.write('1 - Create superuser')
-            password = os.environ.get('CMS_SUPERUSER_PASSWORD', 'superpassword')
+            password = os.environ.get('CMS_SUPERUSER_PASSWORD', 'admin')
             superuser = User.objects.create_superuser(username, None, password, id=8)
             self.stdout.write(self.style.SUCCESS('DONE'))
 
@@ -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'))

test_page/migrations/0002_taxtestpage.py

@@ -0,0 +1,26 @@
+# Generated by Django 4.0.10 on 2023-08-10 21:05
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('wagtailcore', '0069_log_entry_jsonfield'),
+        ('test_page', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='TaxTestPage',
+            fields=[
+                ('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.page')),
+                ('taxonomy_json', models.TextField(blank=True, null=True)),
+            ],
+            options={
+                'abstract': False,
+            },
+            bases=('wagtailcore.page', models.Model),
+        ),
+    ]

test_page/models.py

@@ -5,7 +5,7 @@
 from wagtail.models import Page
 
 from wagtailreacttaxonomy.models import TaxonomyMixin, PageTaxonomyPermissionsMixin, ModelTaxonomyPermissionsMixin, format_permissions_json
-from wagtailreacttaxonomy.edit_handlers import TaxonomyPanel, PermissionsPanel
+from wagtailreacttaxonomy.panels import TaxonomyPanel, PermissionsPanel
 
 
 class TestPage(Page, TaxonomyMixin, PageTaxonomyPermissionsMixin):
@@ -56,4 +56,15 @@ class TestModel(ModelTaxonomyPermissionsMixin):
     def __str__(self):
         return 'TestModel - {0}'.format(self.id)
 
-pre_save.connect(format_permissions_json, sender=TestModel)
+class TaxTestPage(Page, TaxonomyMixin):
+
+    taxonomy_term_panels = [
+        TaxonomyPanel('taxonomy_json', taxonomy_terms_id='test_taxonomy'),
+    ]
+
+    edit_handler = TabbedInterface([
+        ObjectList(Page.content_panels, heading='Content'),
+        ObjectList(taxonomy_term_panels, heading='Taxonomy'),
+    ])
+
+pre_save.connect(format_permissions_json, sender=TestModel)