Upgrade wagtail to 5x

hypha/apply/categories/blocks.py

@@ -21,6 +21,7 @@ def get_categories_as_choices():
 class CategoryQuestionBlock(OptionalFormFieldBlock):
     class Meta:
         template = "stream_forms/render_list_field.html"
+        icon = "folder-open-1"
 
     category = ModelChooserBlock(required=True, choices=get_categories_as_choices)
     multi = BooleanBlock(label=_("Multi select"), required=False)

hypha/apply/funds/admin.py

@@ -179,7 +179,7 @@ class ReviewerSettingAdmin(SettingModelAdmin):
 
 class ApplyAdminGroup(ModelAdminGroup):
     menu_label = "Apply"
-    menu_icon = "folder-open-inverse"
+    menu_icon = "folder-inverse"
     items = (
         RoundAdmin,
         SealedRoundAdmin,

hypha/apply/funds/blocks.py

@@ -48,6 +48,7 @@ class ValueBlock(ApplicationSingleIncludeFieldBlock):
 
     class Meta:
         label = _("Requested amount")
+        icon = "decimal"
 
     def prepare_data(self, value, data, serialize):
         return format_number_as_currency(str(data))

hypha/apply/projects/admin.py

@@ -81,7 +81,7 @@ class VendorFormSettingsAdmin(SettingModelAdmin):
 
 class ProjectAdminGroup(ModelAdminGroup):
     menu_label = "Projects"
-    menu_icon = "duplicate"
+    menu_icon = "folder-open-1"
     items = (
         ContractDocumentCategoryAdmin,
         DocumentCategoryAdmin,

hypha/apply/stream_forms/blocks.py

@@ -127,6 +127,7 @@ class CharFieldBlock(OptionalFormFieldBlock):
 
     class Meta:
         label = _("Text field (single line)")
+        icon = "minus"
         template = "stream_forms/render_unsafe_field.html"
 
     def get_field_class(self, struct_value):
@@ -149,6 +150,7 @@ class MultiInputCharFieldBlock(CharFieldBlock):
 
     class Meta:
         label = _("Text field (single line) (multiple inputs)")
+        icon = "bars"
 
 
 class TextFieldBlock(OptionalFormFieldBlock):
@@ -159,6 +161,7 @@ class TextFieldBlock(OptionalFormFieldBlock):
 
     class Meta:
         label = _("Text field (multi line)")
+        icon = "edit"
         template = "stream_forms/render_unsafe_field.html"
 
     def get_searchable_content(self, value, data):
@@ -172,6 +175,7 @@ class NumberFieldBlock(OptionalFormFieldBlock):
 
     class Meta:
         label = _("Number field")
+        icon = "decimal"
 
     def get_searchable_content(self, value, data):
         return None
@@ -256,7 +260,7 @@ class DropdownFieldBlock(RadioButtonsFieldBlock):
 
     class Meta:
         label = _("Dropdown field")
-        icon = "arrow-down-big"
+        icon = "arrow-down"
 
     def get_field_kwargs(self, struct_value):
         kwargs = super().get_field_kwargs(struct_value)
@@ -272,7 +276,7 @@ class CheckboxesFieldBlock(OptionalFormFieldBlock):
 
     class Meta:
         label = _("Multiple checkboxes field")
-        icon = "list-ul"
+        icon = "tasks"
         template = "stream_forms/render_list_field.html"
 
     def get_field_kwargs(self, struct_value):

hypha/apply/utils/blocks.py

@@ -95,7 +95,7 @@ def clean(self, value):
         try:
             value = super().clean(value)
         except ValidationError as e:
-            error_dict = e.params
+            error_dict = e.params or {}
         else:
             error_dict = {}
 

hypha/public/utils/wagtail_hooks.py

@@ -1,4 +1,3 @@
-from django.templatetags.static import static
 from wagtail import hooks
 from wagtail.contrib.modeladmin.options import (
     ModelAdmin,
@@ -30,13 +29,6 @@ class TaxonomiesModelAdminGroup(ModelAdminGroup):
 modeladmin_register(TaxonomiesModelAdminGroup)
 
 
-@hooks.register("insert_editor_css")
-def editor_css():
-    link = '<link rel="stylesheet" href="{}">\n'
-    path = static("css/apply/wagtail_editor.css")
-    return link.format(path)
-
-
 @hooks.register("after_create_page")
 @hooks.register("after_edit_page")
 def clear_wagtailcache(request, page):

requirements.txt

@@ -49,16 +49,16 @@ mailchimp3==3.0.17
 mistune==2.0.4
 more-itertools==9.0.0
 phonenumberslite==8.13.23
-Pillow==9.4.0
+Pillow>=10.0.1
 psycopg2-binary
 qrcode==7.4.2
 reportlab==3.6.13
 social_auth_app_django==5.0.0
 tablib==3.5.0
 tomd==0.1.3
-wagtail-cache==2.2.0
+wagtail-cache==2.3.0
 wagtail-purge==0.3.0
-wagtail==4.2.2
+wagtail==5.1.3
 whitenoise==5.3.0
 xhtml2pdf==0.2.11
 xmltodict==0.13.0