Update blocks in RecipeStreamBlock to use ImageBlock

bakerydemo/base/blocks.py

@@ -12,7 +12,7 @@
 from wagtail.images.blocks import ImageChooserBlock
 
 
-class ImageBlock(StructBlock):
+class CaptionedImageBlock(StructBlock):
     """
     Custom `StructBlock` for utilizing images with associated caption and
     attribution data
@@ -36,7 +36,7 @@ def get_preview_value(self):
 
     class Meta:
         icon = "image"
-        template = "blocks/image_block.html"
+        template = "blocks/captioned_image_block.html"
         preview_value = {"attribution": "The Wagtail Bakery"}
         description = "An image with optional caption and attribution"
 
@@ -108,7 +108,7 @@ class BaseStreamBlock(StreamBlock):
         ),
         description="A rich text paragraph",
     )
-    image_block = ImageBlock()
+    image_block = CaptionedImageBlock()
     block_quote = BlockQuote()
     embed_block = EmbedBlock(
         help_text="Insert an embed URL e.g https://www.youtube.com/watch?v=SGJFWirQ3ks",

bakerydemo/recipes/blocks.py

@@ -11,9 +11,9 @@
 from wagtail.contrib.table_block.blocks import TableBlock
 from wagtail.contrib.typed_table_block.blocks import TypedTableBlock
 from wagtail.embeds.blocks import EmbedBlock
-from wagtail.images.blocks import ImageChooserBlock
+from wagtail.images.blocks import ImageBlock
 
-from bakerydemo.base.blocks import BlockQuote, HeadingBlock, ImageBlock
+from bakerydemo.base.blocks import BlockQuote, HeadingBlock
 
 
 class RecipeStepBlock(StructBlock):
@@ -57,7 +57,7 @@ class RecipeStreamBlock(StreamBlock):
             ("text", CharBlock()),
             ("numeric", FloatBlock()),
             ("rich_text", RichTextBlock()),
-            ("image", ImageChooserBlock()),
+            ("image", ImageBlock()),
         ],
         group="Content",
         description=(

bakerydemo/recipes/migrations/0002_alter_recipepage_body.py

@@ -0,0 +1,146 @@
+# Generated by Django 6.0.dev20250116121251 on 2025-02-11 16:44
+
+import wagtail.fields
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("recipes", "0001_initial"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="recipepage",
+            name="body",
+            field=wagtail.fields.StreamField(
+                [
+                    ("heading_block", 2),
+                    ("paragraph_block", 3),
+                    ("block_quote", 6),
+                    ("table_block", 7),
+                    ("typed_table_block", 12),
+                    ("image_block", 13),
+                    ("embed_block", 14),
+                    ("ingredients_list", 16),
+                    ("steps_list", 19),
+                ],
+                blank=True,
+                block_lookup={
+                    0: (
+                        "wagtail.blocks.CharBlock",
+                        (),
+                        {"form_classname": "title", "required": True},
+                    ),
+                    1: (
+                        "wagtail.blocks.ChoiceBlock",
+                        [],
+                        {
+                            "blank": True,
+                            "choices": [
+                                ("", "Select a header size"),
+                                ("h2", "H2"),
+                                ("h3", "H3"),
+                                ("h4", "H4"),
+                            ],
+                            "required": False,
+                        },
+                    ),
+                    2: (
+                        "wagtail.blocks.StructBlock",
+                        [[("heading_text", 0), ("size", 1)]],
+                        {"group": "Content"},
+                    ),
+                    3: (
+                        "wagtail.blocks.RichTextBlock",
+                        (),
+                        {
+                            "group": "Content",
+                            "icon": "pilcrow",
+                            "template": "blocks/paragraph_block.html",
+                        },
+                    ),
+                    4: ("wagtail.blocks.TextBlock", (), {}),
+                    5: (
+                        "wagtail.blocks.CharBlock",
+                        (),
+                        {"blank": True, "label": "e.g. Mary Berry", "required": False},
+                    ),
+                    6: (
+                        "wagtail.blocks.StructBlock",
+                        [[("text", 4), ("attribute_name", 5)]],
+                        {"group": "Content"},
+                    ),
+                    7: (
+                        "wagtail.contrib.table_block.blocks.TableBlock",
+                        (),
+                        {"group": "Content"},
+                    ),
+                    8: ("wagtail.blocks.CharBlock", (), {}),
+                    9: ("wagtail.blocks.FloatBlock", (), {}),
+                    10: ("wagtail.blocks.RichTextBlock", (), {}),
+                    11: ("wagtail.images.blocks.ImageBlock", [], {}),
+                    12: (
+                        "wagtail.contrib.typed_table_block.blocks.TypedTableBlock",
+                        [
+                            [
+                                ("text", 8),
+                                ("numeric", 9),
+                                ("rich_text", 10),
+                                ("image", 11),
+                            ]
+                        ],
+                        {"group": "Content"},
+                    ),
+                    13: ("wagtail.images.blocks.ImageBlock", [], {"group": "Media"}),
+                    14: (
+                        "wagtail.embeds.blocks.EmbedBlock",
+                        (),
+                        {
+                            "group": "Media",
+                            "help_text": "Insert an embed URL e.g https://www.youtube.com/watch?v=SGJFWirQ3ks",
+                            "icon": "media",
+                            "template": "blocks/embed_block.html",
+                        },
+                    ),
+                    15: (
+                        "wagtail.blocks.RichTextBlock",
+                        (),
+                        {"features": ["bold", "italic", "link"]},
+                    ),
+                    16: (
+                        "wagtail.blocks.ListBlock",
+                        (15,),
+                        {
+                            "group": "Cooking",
+                            "icon": "list-ol",
+                            "max_num": 10,
+                            "min_num": 2,
+                        },
+                    ),
+                    17: (
+                        "wagtail.blocks.ChoiceBlock",
+                        [],
+                        {"choices": [("S", "Small"), ("M", "Medium"), ("L", "Large")]},
+                    ),
+                    18: (
+                        "wagtail.blocks.StructBlock",
+                        [[("text", 15), ("difficulty", 17)]],
+                        {},
+                    ),
+                    19: (
+                        "wagtail.blocks.ListBlock",
+                        (18,),
+                        {
+                            "group": "Cooking",
+                            "icon": "tasks",
+                            "max_num": 10,
+                            "min_num": 2,
+                        },
+                    ),
+                },
+                help_text="The recipe’s step-by-step instructions and any other relevant information.",
+            ),
+        ),
+    ]

readme.md

@@ -183,8 +183,8 @@ If you're a Python or Django developer, fork the repo and get stuck in! If you'd
 If you change content or images in this repo and need to prepare a new fixture file for export, do the following on a branch:
 
 ```bash
-./manage.py dumpdata --natural-foreign --indent 2 -e auth.permission -e contenttypes -e wagtailcore.GroupCollectionPermission -e wagtailimages.rendition -e sessions -e wagtailsearch.indexentry -e wagtailsearch.sqliteftsindexentry -e wagtailcore.referenceindex -e wagtailcore.pagesubscription > bakerydemo/base/fixtures/bakerydemo.json
-prettier --write bakerydemo/base/fixtures/bakerydemo.json
+./manage.py dumpdata --natural-foreign --indent 2 -e auth.permission -e contenttypes -e wagtailcore.GroupCollectionPermission -e wagtailimages.rendition -e sessions -e wagtailsearch.indexentry -e wagtailsearch.sqliteftsindexentry -e wagtailcore.referenceindex -e wagtailcore.pagesubscription -e wagtailcore.workflowcontenttype -e wagtailadmin.editingsession > bakerydemo/base/fixtures/bakerydemo.json
+npx prettier --write bakerydemo/base/fixtures/bakerydemo.json
 ```
 
 Please optimize any included images to 1200px wide with JPEG compression at 60%. Note that `media/images` is ignored in the repo by `.gitignore` but `media/original_images` is not. Wagtail's local image "renditions" are excluded in the fixture recipe above.