Merge branch 'adamghill:main' into main

Author: ntuckovic

.all-contributorsrc

@@ -221,6 +221,24 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "imankulov",
+      "name": "Roman Imankulov",
+      "avatar_url": "https://avatars.githubusercontent.com/u/75075?v=4",
+      "profile": "https://roman.pt",
+      "contributions": [
+        "test"
+      ]
+    },
+    {
+      "login": "rhymiz",
+      "name": "Lemi Boyce",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7029352?v=4",
+      "profile": "https://github.com/rhymiz",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.github/workflows/python.yml

@@ -6,7 +6,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.7, 3.8, 3.9, "3.10"]
+        python-version: [3.8, 3.9, "3.10", "3.11"]
 
     steps:
       - uses: actions/[email protected]
@@ -21,11 +21,10 @@ jobs:
       - name: Install Poetry
         uses: abatilo/[email protected]
         with:
-          poetry-version: 1.1.15
+          poetry-version: 1.6.1
 
       - name: Set Poetry config
         run: |
-          poetry config virtualenvs.in-project false
           poetry config virtualenvs.path ~/.virtualenvs${{ matrix.python-version }}
 
       - name: Install dependencies

README.md

@@ -218,6 +218,8 @@ Thanks to the following wonderful people ([emoji key](https://allcontributors.or
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://marteydodoo.com"><img src="https://avatars.githubusercontent.com/u/49076?v=4?s=100" width="100px;" alt="Martey Dodoo"/><br /><sub><b>Martey Dodoo</b></sub></a><br /><a href="https://github.com/adamghill/django-unicorn/commits?author=martey" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://digitalpinup.art"><img src="https://avatars.githubusercontent.com/u/1392097?v=4?s=100" width="100px;" alt="Pierre"/><br /><sub><b>Pierre</b></sub></a><br /><a href="https://github.com/adamghill/django-unicorn/commits?author=bloodywing" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://roman.pt"><img src="https://avatars.githubusercontent.com/u/75075?v=4?s=100" width="100px;" alt="Roman Imankulov"/><br /><sub><b>Roman Imankulov</b></sub></a><br /><a href="https://github.com/adamghill/django-unicorn/commits?author=imankulov" title="Tests">⚠️</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/rhymiz"><img src="https://avatars.githubusercontent.com/u/7029352?v=4?s=100" width="100px;" alt="Lemi Boyce"/><br /><sub><b>Lemi Boyce</b></sub></a><br /><a href="https://github.com/adamghill/django-unicorn/commits?author=rhymiz" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

django_unicorn/settings.py

@@ -73,10 +73,10 @@ def get_minify_html_enabled():
 
     if minify_html_enabled:
         try:
-            import htmlmin
+            import htmlmin  # noqa: F401
         except ModuleNotFoundError:
             logger.error(
-                "MINIFY_HTML is `True`, but minify extra could not be imported. Install with `unicorn[minify]`."
+                "MINIFY_HTML is `True`, but minify extra could not be imported. Install with `django-unicorn[minify]`."
             )
 
             return False

django_unicorn/static/unicorn/js/messageSender.js

@@ -136,7 +136,7 @@ export function send(component, callback) {
       component.hash = responseJson.hash;
 
       let parent = responseJson.parent || {};
-      const rerenderedComponent = responseJson.dom || {};
+      const rerenderedComponent = responseJson.dom || "";
       const partials = responseJson.partials || [];
       const { checksum } = responseJson;
 

django_unicorn/static/unicorn/js/unicorn.min.js

@@ -285,12 +285,21 @@ def cast_value(type_hint, value):
 
     type_hints = []
 
-    if get_origin(type_hint) is Union:
+    if get_origin(type_hint) is Union or get_origin(type_hint) is list:
         for arg in get_args(type_hint):
             type_hints.append(arg)
     else:
         type_hints.append(type_hint)
 
+    if get_origin(type_hint) is list:
+        if len(type_hints) == 1:
+            # There should only be one argument for a list type hint
+            arg = type_hints[0]
+
+            # Handle type hints that are a list by looping over the value and
+            # casting each item individually
+            return [cast_value(arg, item) for item in value]
+
     for type_hint in type_hints:
         caster = CASTERS.get(type_hint)
 

django_unicorn/utils.py

@@ -260,16 +260,18 @@ def _process_component_request(
         key: component_request.data[key] for key in sorted(component_request.data)
     }
 
-    res = {
+    result = {
         "id": component_request.id,
         "data": updated_data,
         "errors": component.errors,
         "calls": component.calls,
         "checksum": generate_checksum(str(component_request.data)),
     }
 
+    render_not_modified = False
+
     if partial_doms:
-        res.update({"partials": partial_doms})
+        result.update({"partials": partial_doms})
     else:
         hash = generate_checksum(rendered_component)
 
@@ -278,42 +280,46 @@ def _process_component_request(
             and (not return_data or not return_data.value)
             and not component.calls
         ):
-            raise RenderNotModified()
+            if not component.parent:
+                raise RenderNotModified()
+            else:
+                render_not_modified = True
 
-        # Make sure that partials with comments or blank lines before the root element only return the root element
+        # Make sure that partials with comments or blank lines before the root element
+        # only return the root element
         soup = BeautifulSoup(rendered_component, features="html.parser")
         rendered_component = str(get_root_element(soup))
 
-        res.update(
+        result.update(
             {
                 "dom": rendered_component,
                 "hash": hash,
             }
         )
 
     if return_data:
-        res.update(
+        result.update(
             {
                 "return": return_data.get_data(),
             }
         )
 
         if return_data.redirect:
-            res.update(
+            result.update(
                 {
                     "redirect": return_data.redirect,
                 }
             )
 
         if return_data.poll:
-            res.update(
+            result.update(
                 {
                     "poll": return_data.poll,
                 }
             )
 
     parent_component = component.parent
-    parent_res = res
+    parent_result = result
 
     while parent_component:
         # TODO: Should parent_component.hydrate() be called?
@@ -339,12 +345,22 @@ def _process_component_request(
                 }
             )
 
-        parent_res.update({"parent": parent})
+        if render_not_modified:
+            # TODO: Determine if all parents have not changed and return a 304 if
+            # that's the case
+            # i.e. render_not_modified = render_not_modified and (parent hash test)
+            pass
+
+        # If there is a parent dom and a child dom, remove the child dom because it is superfluous
+        if parent.get("dom") and result.get("dom"):
+            del result["dom"]
+
+        parent_result.update({"parent": parent})
         component = parent_component
         parent_component = parent_component.parent
-        parent_res = parent
+        parent_result = parent
 
-    return res
+    return result
 
 
 def _handle_component_request(

django_unicorn/views/__init__.py

@@ -46,7 +46,7 @@ class TestView(UnicornView):
     component_or_field = component
     data_or_dict = data  # Could be an internal portion of data that gets set
 
-    for (idx, property_name_part) in enumerate(property_name_parts):
+    for idx, property_name_part in enumerate(property_name_parts):
         if hasattr(component_or_field, property_name_part):
             if idx == len(property_name_parts) - 1:
                 if hasattr(component_or_field, "_set_property"):

django_unicorn/views/action_parsers/utils.py

@@ -1,5 +1,15 @@
 # Changelog
 
+## 0.55.0
+
+- Support `List`/`list` type annotations for component actions and fields ([#582](https://github.com/adamghill/django-unicorn/pull/582)).
+- Fix: calling a method in a parent will have the request available ([#583]https://github.com/adamghill/django-unicorn/pull/583).
+
+**Breaking changes**
+
+- Dropped official support for Python 3.7 because its [end of life was June 27, 2023](https://endoflife.date/python).
+- Dropped official support for Django 2.2 because its [end of life was April 1, 2022](https://endoflife.date/django).
+
 ## 0.54.0
 
 - Coerce type annotated arguments in an action method to the specified type ([#571](https://github.com/adamghill/django-unicorn/pull/571)).