Move the data-endpoint and data-iommi-id html attributes to the table container

This is to avoid them being over-written by any empty_message provided resulting in no table tag being rendered

Author: Johan Lübcke

.pre-commit-config.yaml

@@ -11,6 +11,6 @@ repos:
       - id: black
         language_version: python3.8
   - repo: https://github.com/pycqa/flake8.git
-    rev: 3.9.2
+    rev: 7.0.0
     hooks:
       - id: flake8

iommi/edit_table__tests.py

@@ -58,10 +58,10 @@ def test_edit_table_rendering():
         # language=html
         expected_html="""
             <form enctype="multipart/form-data" method="post">
-                <div class="iommi-table-container">
+                <div class="iommi-table-container" data-endpoint="/endpoints/tbody" data-iommi-id="">
                     <div class="iommi-table-plus-paginator">
                         <table class="table" data-add-template=\'&lt;tr data-pk="#sentinel#"&gt;&lt;td&gt;&lt;input id="id_editable_thing__#sentinel#" name="editable_thing/#sentinel#" type="text" value=""&gt;&lt;/td&gt;
-&lt;td&gt;&lt;/td&gt;&lt;/tr&gt;\' data-endpoint="/endpoints/tbody" data-iommi-id="" data-next-virtual-pk="-1">
+&lt;td&gt;&lt;/td&gt;&lt;/tr&gt;\' data-next-virtual-pk="-1">
                             <thead>
                                 <tr>
                                     <th class="first_column subheader"> Editable thing </th>
@@ -336,12 +336,12 @@ def test_edit_table_post_create_hardcoded():
             'POST',
             **{
                 # edit
-                f'columns/a/{foo.pk}': f'2',
+                f'columns/a/{foo.pk}': '2',
                 f'columns/b/{foo.pk}': 'hardcoded column should be ignored',
                 # create
-                'columns/a/-2': f'4',
+                'columns/a/-2': '4',
                 'columns/b/-2': 'hardcoded column should be ignored',
-                'columns/a/-1': f'3',
+                'columns/a/-1': '3',
                 'columns/b/-1': 'hardcoded column should be ignored',
                 '-actions/submit': '',
             },
@@ -351,10 +351,7 @@ def test_edit_table_post_create_hardcoded():
     response = edit_table.render_to_response()
     assert response.status_code == 302
 
-    assert [
-        dict(a=x.a, b=x.b)
-        for x in TFoo.objects.all().order_by('pk')
-    ] == [
+    assert [dict(a=x.a, b=x.b) for x in TFoo.objects.all().order_by('pk')] == [
         dict(a=2, b='asd'),
         dict(a=3, b='hardcoded'),
         dict(a=4, b='hardcoded'),

iommi/static/js/iommi.js

@@ -179,9 +179,7 @@ class IommiBase {
     }
 
     async updateTableContainer(container, params, extra){
-        const tbodyPath = container.querySelector('[data-endpoint]').getAttribute(
-            'data-endpoint'
-        );
+        const tbodyPath = container.getAttribute('data-endpoint');
 
         this.callDeprecatedSpinner(true, container);  // deprecated, use event "iommi.loading.start" instead
 

iommi/style__tests.py

@@ -324,7 +324,6 @@ def test_get_style_error():
 
 
 class MyRefinableObject(RefinableObject):
-
     foo: 'MyRefinableObject' = Refinable()
     bar: int = Refinable()
     baz: int = Refinable()
@@ -789,7 +788,7 @@ class TestTable(Table):
         table=TestTable(rows=(x for x in [Struct(foo=True)]), iommi_style='base', attrs__class__table=True),
         # language=html
         expected_html="""
-            <table class="table" data-endpoint="/endpoints/tbody" data-iommi-id="">
+            <table class="table">
                 <thead>
                     <tr>
                         <th class="first_column iommi_sort_header subheader"> <a href="?order=foo"> Foo </a> </th>
@@ -808,7 +807,7 @@ class TestTable(Table):
         table=TestTable(rows=(x for x in [Struct(foo=True)]), iommi_style='bulma', attrs__class__table=True),
         # language=html
         expected_html="""
-            <table class="is-fullwidth is-hoverable table" data-endpoint="/endpoints/tbody" data-iommi-id="">
+            <table class="is-fullwidth is-hoverable table">
                 <thead>
                     <tr>
                         <th class="first_column iommi_sort_header subheader"> <a href="?order=foo"> Foo </a> </th>
@@ -827,7 +826,7 @@ class TestTable(Table):
         table=TestTable(rows=(x for x in [Struct(foo=True)]), iommi_style='bootstrap5', attrs__class__table=True),
         # language=html
         expected_html="""
-            <table class="table table-sm" data-endpoint="/endpoints/tbody" data-iommi-id="">
+            <table class="table table-sm">
                 <thead>
                     <tr>
                         <th class="first_column iommi_sort_header subheader text-nowrap"> <a href="?order=foo"> Foo </a> </th>

iommi/table.py

@@ -1713,7 +1713,7 @@ class Meta:
         }
         endpoints__csv__func = endpoint__csv
 
-        attrs = Namespace(
+        container__attrs = Namespace(
             {
                 'data-endpoint': lambda table, **_: DISPATCH_PREFIX + table.endpoints.tbody.iommi_path,
                 'data-iommi-id': lambda table, **_: table.iommi_path,