Merge branch 'develop' into chore/docker-compose-remove-container-name

Author: ahosgood

config/settings/base.py

@@ -9,6 +9,7 @@
 For the full list of settings and their values, see
 https://docs.djangoproject.com/en/3.1/ref/settings/
 """
+
 import os
 
 from sysconfig import get_path
@@ -73,7 +74,6 @@
     "wagtailfontawesomesvg",
     "wagtailmedia",
     "wagtail.contrib.settings",
-    "wagtail.contrib.styleguide",
     "generic_chooser",
     "wagtailmetadata",
     "modelcluster",

etna/articles/models.py

@@ -136,7 +136,6 @@ class ArticleIndexPage(BasePageWithIntro):
         [("featuredpages", FeaturedCollectionBlock())],
         blank=True,
         null=True,
-        use_json_field=True,
     )
 
     api_fields = BasePageWithIntro.api_fields + [
@@ -212,9 +211,7 @@ class ArticlePage(
     The ArticlePage model.
     """
 
-    body = StreamField(
-        ArticlePageStreamBlock, blank=True, null=True, use_json_field=True
-    )
+    body = StreamField(ArticlePageStreamBlock, blank=True, null=True)
 
     # DataLayerMixin overrides
     gtm_content_group = "Explore the collection"
@@ -372,9 +369,7 @@ class FocusedArticlePage(
     The FocusedArticlePage model.
     """
 
-    body = StreamField(
-        ArticlePageStreamBlock, blank=True, null=True, use_json_field=True
-    )
+    body = StreamField(ArticlePageStreamBlock, blank=True, null=True)
 
     # DataLayerMixin overrides
     gtm_content_group = "Explore the collection"
@@ -595,7 +590,6 @@ class RecordArticlePage(
         max_num=1,
         blank=True,
         null=True,
-        use_json_field=True,
     )
 
     # DataLayerMixin overrides

etna/collections/models.py

@@ -84,7 +84,7 @@ class ExplorerIndexPage(AlertMixin, BasePageWithIntro):
     explorer.
     """
 
-    body = StreamField(ExplorerIndexPageStreamBlock, blank=True, use_json_field=True)
+    body = StreamField(ExplorerIndexPageStreamBlock, blank=True)
 
     articles_title = models.CharField(
         max_length=100,
@@ -115,7 +115,6 @@ class ExplorerIndexPage(AlertMixin, BasePageWithIntro):
         [("featuredarticles", FeaturedArticlesBlock())],
         blank=True,
         null=True,
-        use_json_field=True,
     )
 
     content_panels = BasePageWithIntro.content_panels + [
@@ -169,7 +168,7 @@ class TopicExplorerIndexPage(RequiredHeroImageMixin, BasePageWithIntro):
     This page lists all child TopicExplorerPages
     """
 
-    body = StreamField(TopicIndexPageStreamBlock, blank=True, use_json_field=True)
+    body = StreamField(TopicIndexPageStreamBlock, blank=True)
 
     content_panels = (
         BasePageWithIntro.content_panels
@@ -250,7 +249,7 @@ class Meta:
         "articles.RecordArticlePage", blank=True, null=True, on_delete=models.SET_NULL
     )
 
-    body = StreamField(TopicExplorerPageStreamBlock, blank=True, use_json_field=True)
+    body = StreamField(TopicExplorerPageStreamBlock, blank=True)
 
     skos_id = models.CharField(
         unique=True,
@@ -400,7 +399,7 @@ class TimePeriodExplorerIndexPage(RequiredHeroImageMixin, BasePageWithIntro):
     This page lists all child TimePeriodExplorerPage
     """
 
-    body = StreamField(TopicIndexPageStreamBlock, blank=True, use_json_field=True)
+    body = StreamField(TopicIndexPageStreamBlock, blank=True)
 
     content_panels = (
         BasePageWithIntro.content_panels
@@ -479,9 +478,7 @@ class Meta:
     featured_record_article = models.ForeignKey(
         "articles.RecordArticlePage", blank=True, null=True, on_delete=models.SET_NULL
     )
-    body = StreamField(
-        TimePeriodExplorerPageStreamBlock, blank=True, use_json_field=True
-    )
+    body = StreamField(TimePeriodExplorerPageStreamBlock, blank=True)
     start_year = models.IntegerField(blank=False)
     end_year = models.IntegerField(blank=False)
     content_panels = (

etna/feedback/models.py

@@ -113,7 +113,6 @@ class FeedbackPrompt(DraftStateMixin, RevisionMixin, ClusterableModel):
     )
     response_options = StreamField(
         [("option", ResponseOptionBlock())],
-        use_json_field=True,
         verbose_name=_("response options"),
     )
     thank_you_heading = models.CharField(

etna/generic_pages/models.py

@@ -7,9 +7,7 @@
 
 
 class GeneralPage(BasePage):
-    body = StreamField(
-        GeneralPageStreamBlock, blank=True, null=True, use_json_field=True
-    )
+    body = StreamField(GeneralPageStreamBlock, blank=True, null=True)
     content_panels = BasePage.content_panels + [
         FieldPanel("body"),
     ]

etna/home/models.py

@@ -9,7 +9,7 @@
 
 
 class HomePage(AlertMixin, BasePageWithIntro):
-    body = StreamField(HomePageStreamBlock, blank=True, null=True, use_json_field=True)
+    body = StreamField(HomePageStreamBlock, blank=True, null=True)
 
     content_panels = BasePageWithIntro.content_panels + [
         FieldPanel("body"),

etna/records/tests/test_views.py

@@ -796,9 +796,9 @@ def test_back_to_search_render_with_catalogue_search_within_expiry(self):
 
         session = self.client.session
         session["back_to_search_url"] = search_url_gen_html_resp
-        session[
-            "back_to_search_url_timestamp"
-        ] = self.back_to_search_url_timestamp.isoformat()
+        session["back_to_search_url_timestamp"] = (
+            self.back_to_search_url_timestamp.isoformat()
+        )
         session.save()
 
         response = self.client.get(self.record_detail_url)
@@ -850,9 +850,9 @@ def test_new_search_render_with_session(self):
 
         session = self.client.session
         session["back_to_search_url"] = browser_search_url
-        session[
-            "back_to_search_url_timestamp"
-        ] = self.back_to_search_url_timestamp.isoformat()
+        session["back_to_search_url_timestamp"] = (
+            self.back_to_search_url_timestamp.isoformat()
+        )
         session.save()
 
         response = self.client.get(self.record_detail_url)

etna/search/tests/test_search_tags.py

@@ -206,7 +206,7 @@ def setUp(self):
         )
 
     def test_render_sort_by_input_input_id(self):
-        expected_html = '<select name="sort_by" class="search-sort-view__form-select" id="id_sort_by_somevalue">'
+        expected_html = '<select name="sort_by" class="search-sort-view__form-select" id="id_sort_by_somevalue" aria-invalid="true">'
         self.assertIn(
             expected_html, render_sort_by_input(self.form, id_suffix="somevalue")
         )

etna/search/views.py

@@ -378,9 +378,9 @@ def set_session_info(self) -> None:
         """
 
         self.request.session["back_to_search_url"] = self.request.get_full_path()
-        self.request.session[
-            "back_to_search_url_timestamp"
-        ] = timezone.now().isoformat()
+        self.request.session["back_to_search_url_timestamp"] = (
+            timezone.now().isoformat()
+        )
         return None
 
 

etna/whatson/models.py

@@ -292,13 +292,11 @@ class WhatsOnPage(BasePageWithIntro):
         [("promoted_links", WhatsOnPromotedLinksBlock())],
         blank=True,
         max_num=1,
-        use_json_field=True,
     )
     large_card_links = StreamField(
         [("large_card_links", LargeCardLinksBlock())],
         blank=True,
         max_num=1,
-        use_json_field=True,
     )
 
     def serve(self, request):
@@ -1072,7 +1070,6 @@ class ExhibitionPage(ArticleTagMixin, TopicalPageMixin, BasePageWithIntro):
         [("relatedarticles", RelatedArticlesBlock())],
         blank=True,
         null=True,
-        use_json_field=True,
     )
 
     # Promote tab

lint-requirements.txt

@@ -1,3 +1,3 @@
-flake8==6.1.0
-isort==5.12.0
-black==23.11.0
+flake8==7.0.0
+isort==5.13.2
+black==24.2.0