mirror
/
wagtail
kopia lustrzana https://github.com/wagtail/wagtail
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Include Block.definition_prefix as blockDefId in blocks' Telepath metadata

pull/12700/head
Sage Abdullah 2024-12-16 16:41:29 +00:00
rodzic 3ea241370d
commit 7c0712cc38
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: EB1A33CC51CC0217
10 zmienionych plików z 69 dodań i 0 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

1
wagtail/blocks/field_block.py
Wyświetl plik

@ -112,6 +112,7 @@ class FieldBlockAdapter(Adapter):
"label": block.label,
"required": block.required,
"icon": block.meta.icon,
"blockDefId": block.definition_prefix,
"classname": " ".join(classname),
"showAddCommentButton": getattr(
block.field.widget, "show_add_comment_button", True

1
wagtail/blocks/list_block.py
Wyświetl plik

@ -450,6 +450,7 @@ class ListBlockAdapter(Adapter):
meta = {
"label": block.label,
"icon": block.meta.icon,
"blockDefId": block.definition_prefix,
"classname": block.meta.form_classname,
"collapsed": block.meta.collapsed,
"strings": {

1
wagtail/blocks/static_block.py
Wyświetl plik

@ -58,6 +58,7 @@ class StaticBlockAdapter(Adapter):
text_or_html: admin_text,
"icon": block.meta.icon,
"label": block.label,
"blockDefId": block.definition_prefix,
},
]

1
wagtail/blocks/stream_block.py
Wyświetl plik

@ -828,6 +828,7 @@ class StreamBlockAdapter(Adapter):
"label": block.label,
"required": block.required,
"icon": block.meta.icon,
"blockDefId": block.definition_prefix,
"classname": block.meta.form_classname,
"maxNum": block.meta.max_num,
"minNum": block.meta.min_num,

1
wagtail/blocks/struct_block.py
Wyświetl plik

@ -403,6 +403,7 @@ class StructBlockAdapter(Adapter):
"label": block.label,
"required": block.required,
"icon": block.meta.icon,
"blockDefId": block.definition_prefix,
"classname": block.meta.form_classname,
}

1
wagtail/contrib/table_block/tests.py
Wyświetl plik

@ -571,6 +571,7 @@ class TestTableBlockForm(WagtailTestUtils, SimpleTestCase):
"label": "Test tableblock",
"required": True,
"icon": "table",
"blockDefId": block.definition_prefix,
"classname": "w-field w-field--char_field w-field--table_input",
"showAddCommentButton": True,
"strings": {"ADD_COMMENT": "Add Comment"},

1
wagtail/contrib/typed_table_block/blocks.py
Wyświetl plik

@ -334,6 +334,7 @@ class TypedTableBlockAdapter(Adapter):
"label": block.label,
"required": block.required,
"icon": block.meta.icon,
"blockDefId": block.definition_prefix,
"strings": {
"CAPTION": _("Caption"),
"CAPTION_HELP_TEXT": _(

31
wagtail/contrib/typed_table_block/tests.py
Wyświetl plik

@ -9,6 +9,7 @@ from wagtail.blocks.struct_block import StructBlockValidationError
from wagtail.contrib.typed_table_block.blocks import (
TypedTable,
TypedTableBlock,
TypedTableBlockAdapter,
TypedTableBlockValidationError,
)
@ -223,6 +224,36 @@ class TestTableBlock(TestCase):
# rendering should use the block renderings of the child blocks ('FR' not 'fr')
self.assertIn("<td>FR</td>", html)
def test_adapt(self):
block = TypedTableBlock()
block.set_name("test_typedtableblock")
js_args = TypedTableBlockAdapter().js_args(block)
self.assertEqual(js_args[0], "test_typedtableblock")
self.assertEqual(
js_args[-1],
{
"label": "Test typedtableblock",
"required": False,
"icon": "table",
"blockDefId": block.definition_prefix,
"strings": {
"CAPTION": "Caption",
"CAPTION_HELP_TEXT": (
"A heading that identifies the overall topic of the table, and is useful for screen reader users."
),
"ADD_COLUMN": "Add column",
"ADD_ROW": "Add row",
"COLUMN_HEADING": "Column heading",
"INSERT_COLUMN": "Insert column",
"DELETE_COLUMN": "Delete column",
"INSERT_ROW": "Insert row",
"DELETE_ROW": "Delete row",
},
},
)
def test_validation_error_as_json(self):
error = TypedTableBlockValidationError(
cell_errors={

2
wagtail/snippets/tests/test_snippets.py
Wyświetl plik

@ -5538,6 +5538,7 @@ class TestSnippetChooserBlock(TestCase):
"label": "Test snippetchooserblock",
"required": True,
"icon": "snippet",
"blockDefId": block.definition_prefix,
"helpText": "pick an advert, any advert",
"classname": "w-field w-field--model_choice_field w-field--admin_snippet_chooser",
"showAddCommentButton": True,
@ -5846,6 +5847,7 @@ class TestSnippetChooserBlockWithCustomPrimaryKey(TestCase):
"label": "Test snippetchooserblock",
"required": True,
"icon": "snippet",
"blockDefId": block.definition_prefix,
"helpText": "pick an advert, any advert",
"classname": "w-field w-field--model_choice_field w-field--admin_snippet_chooser",
"showAddCommentButton": True,

29
wagtail/tests/test_blocks.py
Wyświetl plik

@ -98,6 +98,7 @@ class TestFieldBlock(WagtailTestUtils, SimpleTestCase):
"helpText": "Some helpful text",
"required": True,
"icon": "placeholder",
"blockDefId": block.definition_prefix,
"classname": "w-field w-field--char_field w-field--text_input",
"showAddCommentButton": True,
"strings": {"ADD_COMMENT": "Add Comment"},
@ -204,6 +205,7 @@ class TestFieldBlock(WagtailTestUtils, SimpleTestCase):
"label": "Test choiceblock",
"required": True,
"icon": "placeholder",
"blockDefId": block.definition_prefix,
"classname": "w-field w-field--choice_field w-field--select",
"showAddCommentButton": True,
"strings": {"ADD_COMMENT": "Add Comment"},
@ -613,6 +615,7 @@ class TestRichTextBlock(TestCase):
"classname": "w-field w-field--char_field w-field--custom_rich_text_area",
"icon": "pilcrow",
"label": "Test richtextblock",
"blockDefId": block.definition_prefix,
"required": True,
"showAddCommentButton": True,
"strings": {"ADD_COMMENT": "Add Comment"},
@ -635,6 +638,7 @@ class TestRichTextBlock(TestCase):
"label": "Test richtextblock",
"required": True,
"icon": "pilcrow",
"blockDefId": block.definition_prefix,
"classname": "w-field w-field--char_field w-field--draftail_rich_text_area",
"showAddCommentButton": False, # Draftail manages its own comments
"strings": {"ADD_COMMENT": "Add Comment"},
@ -657,6 +661,7 @@ class TestRichTextBlock(TestCase):
"label": "Test richtextblock",
"required": True,
"icon": "pilcrow",
"blockDefId": block.definition_prefix,
"classname": "w-field w-field--char_field w-field--draftail_rich_text_area",
"showAddCommentButton": False, # Draftail manages its own comments
"strings": {"ADD_COMMENT": "Add Comment"},
@ -772,6 +777,7 @@ class TestChoiceBlock(WagtailTestUtils, SimpleTestCase):
"label": "Test choiceblock",
"required": True,
"icon": "placeholder",
"blockDefId": block.definition_prefix,
"classname": "w-field w-field--choice_field w-field--select",
"showAddCommentButton": True,
"strings": {"ADD_COMMENT": "Add Comment"},
@ -1173,6 +1179,7 @@ class TestMultipleChoiceBlock(WagtailTestUtils, SimpleTestCase):
"label": "Test choiceblock",
"required": True,
"icon": "placeholder",
"blockDefId": block.definition_prefix,
"classname": "w-field w-field--multiple_choice_field w-field--select_multiple",
"showAddCommentButton": True,
"strings": {"ADD_COMMENT": "Add Comment"},
@ -1609,6 +1616,7 @@ class TestRawHTMLBlock(unittest.TestCase):
"label": "Test rawhtmlblock",
"required": True,
"icon": "code",
"blockDefId": block.definition_prefix,
"classname": "w-field w-field--char_field w-field--textarea",
"showAddCommentButton": True,
"strings": {"ADD_COMMENT": "Add Comment"},
@ -1951,6 +1959,7 @@ class TestStructBlock(SimpleTestCase):
"label": "Test structblock",
"required": False,
"icon": "placeholder",
"blockDefId": block.definition_prefix,
"classname": "struct-block",
},
)
@ -1980,6 +1989,7 @@ class TestStructBlock(SimpleTestCase):
"label": "Test structblock",
"required": False,
"icon": "placeholder",
"blockDefId": block.definition_prefix,
"classname": "struct-block",
"formTemplate": "<div>Hello</div>",
},
@ -2004,6 +2014,7 @@ class TestStructBlock(SimpleTestCase):
"label": "Test structblock",
"required": False,
"icon": "placeholder",
"blockDefId": block.definition_prefix,
"classname": "struct-block",
"formTemplate": "<div>Hello</div>",
},
@ -2037,6 +2048,7 @@ class TestStructBlock(SimpleTestCase):
"label": "Test structblock",
"required": False,
"icon": "placeholder",
"blockDefId": block.definition_prefix,
"classname": "struct-block",
"helpIcon": (
'<svg class="icon icon-help default" aria-hidden="true">'
@ -2062,6 +2074,7 @@ class TestStructBlock(SimpleTestCase):
"label": "Test structblock",
"required": False,
"icon": "placeholder",
"blockDefId": block.definition_prefix,
"classname": "struct-block",
"helpIcon": (
'<svg class="icon icon-help default" aria-hidden="true">'
@ -2690,6 +2703,7 @@ class TestListBlock(WagtailTestUtils, SimpleTestCase):
{
"label": "Test listblock",
"icon": "placeholder",
"blockDefId": block.definition_prefix,
"classname": None,
"collapsed": False,
"strings": {
@ -2720,6 +2734,7 @@ class TestListBlock(WagtailTestUtils, SimpleTestCase):
{
"label": "Test listblock",
"icon": "placeholder",
"blockDefId": block.definition_prefix,
"classname": None,
"collapsed": False,
"minNum": 2,
@ -2894,6 +2909,7 @@ class TestListBlock(WagtailTestUtils, SimpleTestCase):
{
"label": "Test listblock",
"icon": "placeholder",
"blockDefId": block.definition_prefix,
"classname": "special-list-class",
"collapsed": False,
"strings": {
@ -2927,6 +2943,7 @@ class TestListBlock(WagtailTestUtils, SimpleTestCase):
{
"label": "Test listblock",
"icon": "placeholder",
"blockDefId": block.definition_prefix,
"classname": "custom-list-class",
"collapsed": False,
"strings": {
@ -3564,6 +3581,7 @@ class TestStreamBlock(WagtailTestUtils, SimpleTestCase):
{
"label": "Test streamblock",
"icon": "placeholder",
"blockDefId": block.definition_prefix,
"classname": None,
"collapsed": False,
"maxNum": None,
@ -4290,6 +4308,7 @@ class TestStreamBlock(WagtailTestUtils, SimpleTestCase):
{
"label": "Test streamblock",
"icon": "placeholder",
"blockDefId": block.definition_prefix,
"minNum": None,
"maxNum": None,
"blockCounts": {},
@ -4392,6 +4411,7 @@ class TestStreamBlock(WagtailTestUtils, SimpleTestCase):
{
"label": "Test streamblock",
"icon": "placeholder",
"blockDefId": block.definition_prefix,
"minNum": None,
"maxNum": None,
"blockCounts": {},
@ -4737,6 +4757,7 @@ class TestPageChooserBlock(TestCase):
"label": "Test pagechooserblock",
"required": True,
"icon": "doc-empty-inverse",
"blockDefId": block.definition_prefix,
"helpText": "pick a page, any page",
"classname": "w-field w-field--model_choice_field w-field--admin_page_chooser",
"showAddCommentButton": True,
@ -4940,6 +4961,7 @@ class TestStaticBlock(unittest.TestCase):
{
"text": "Latest posts - This block doesn't need to be configured, it will be displayed automatically",
"icon": "placeholder",
"blockDefId": block.definition_prefix,
"label": "Posts static block",
},
)
@ -4961,6 +4983,7 @@ class TestStaticBlock(unittest.TestCase):
{
"text": "Latest posts - This block doesn't need to be configured, it will be displayed automatically",
"icon": "placeholder",
"blockDefId": block.definition_prefix,
"label": "Posts static block",
},
)
@ -4981,6 +5004,7 @@ class TestStaticBlock(unittest.TestCase):
{
"text": "Latest posts: this block has no options.",
"icon": "placeholder",
"blockDefId": block.definition_prefix,
"label": "Latest posts",
},
)
@ -5002,6 +5026,7 @@ class TestStaticBlock(unittest.TestCase):
{
"text": "Posts static block: this block has no options.",
"icon": "placeholder",
"blockDefId": block.definition_prefix,
"label": "Posts static block",
},
)
@ -5023,6 +5048,7 @@ class TestStaticBlock(unittest.TestCase):
{
"html": "<b>Latest posts</b> - This block doesn't need to be configured, it will be displayed automatically",
"icon": "placeholder",
"blockDefId": block.definition_prefix,
"label": "Posts static block",
},
)
@ -5077,6 +5103,7 @@ class TestDateBlock(TestCase):
"label": "Test dateblock",
"required": True,
"icon": "date",
"blockDefId": block.definition_prefix,
"classname": "w-field w-field--date_field w-field--admin_date_input",
"showAddCommentButton": True,
"strings": {"ADD_COMMENT": "Add Comment"},
@ -5110,6 +5137,7 @@ class TestTimeBlock(TestCase):
"label": "Test timeblock",
"required": True,
"icon": "time",
"blockDefId": block.definition_prefix,
"classname": "w-field w-field--time_field w-field--admin_time_input",
"showAddCommentButton": True,
"strings": {"ADD_COMMENT": "Add Comment"},
@ -5143,6 +5171,7 @@ class TestDateTimeBlock(TestCase):
"label": "Test datetimeblock",
"required": True,
"icon": "date",
"blockDefId": block.definition_prefix,
"classname": "w-field w-field--date_time_field w-field--admin_date_time_input",
"showAddCommentButton": True,
"strings": {"ADD_COMMENT": "Add Comment"},