Address review feedback

Author: aclark4life

django_mongodb_extensions/mql_panel/forms.py

@@ -110,7 +110,7 @@ def _execute_query(self, db, collection, collection_name, operation, args_list):
 
     def _flatten_single_key_dicts(self, obj):
         if isinstance(obj, dict):
-            if len(obj) == 1:
+            if len(obj) == 1 and next(iter(obj)).startswith("$"):
                 only_value = next(iter(obj.values()))
                 return self._flatten_single_key_dicts(only_value)
             return {

django_mongodb_extensions/templates/mql_panel/subtype_value.html

@@ -1,13 +1,28 @@
 {% if sub.type == "dict" %}
   <table class="subtable">
     {% for inner in sub.value %}
-      <tr><th>{{ inner.key }}</th><td>{{ inner.value }}</td></tr>
+      <tr>
+        <th>{{ inner.key }}</th>
+        <td>
+          {% if inner.type %}
+            {% include "mql_panel/subtype_value.html" with sub=inner %}
+          {% else %}
+            {{ inner.value }}
+          {% endif %}
+        </td>
+      </tr>
     {% endfor %}
   </table>
 {% elif sub.type == "list" %}
   <ul>
     {% for inner in sub.value %}
-      <li>{{ inner.value }}</li>
+      <li>
+        {% if inner.type %}
+          {% include "mql_panel/subtype_value.html" with sub=inner %}
+        {% else %}
+          {{ inner.value }}
+        {% endif %}
+      </li>
     {% endfor %}
   </ul>
 {% else %}

tests/mql_panel/test_forms.py

@@ -69,3 +69,68 @@ def test_list_field(self):
         self.assertEqual(value_map[2], "69cd51ddf1a98c14c906c51e")  # ObjectId string
         for item in result["value"]:
             self.assertIs(item["is_json"], False)
+
+    def test_list_of_embedded_dicts(self):
+        tags = [
+            {"name": "cool_tag", "number": 42},
+            {"name": "other_tag", "number": 7},
+        ]
+        result = self.form._format_cell_value(tags)
+        self.assertEqual(result["type"], "list")
+        self.assertIs(result["is_json"], False)
+        for item in result["value"]:
+            self.assertEqual(item["type"], "dict")
+            self.assertIs(item["is_json"], False)
+            inner_map = {inner["key"]: inner["value"] for inner in item["value"]}
+            self.assertIn("name", inner_map)
+            self.assertIn("number", inner_map)
+
+    def test_dict_with_nested_list_of_dicts(self):
+        address = {
+            "street": "123 Main St",
+            "tags": [
+                {"name": "cool_tag", "number": 42},
+            ],
+        }
+        result = self.form._format_cell_value(address)
+        self.assertEqual(result["type"], "dict")
+        self.assertIs(result["is_json"], False)
+        items_by_key = {item["key"]: item for item in result["value"]}
+        self.assertEqual(items_by_key["street"]["value"], "123 Main St")
+        tags_item = items_by_key["tags"]
+        self.assertEqual(tags_item["type"], "list")
+        self.assertIs(tags_item["is_json"], False)
+        first_tag = tags_item["value"][0]
+        self.assertEqual(first_tag["type"], "dict")
+        inner_map = {inner["key"]: inner["value"] for inner in first_tag["value"]}
+        self.assertEqual(inner_map["name"], "cool_tag")
+        self.assertEqual(inner_map["number"], "42")
+
+    def test_deeply_nested_embedded_document(self):
+        address = {
+            "street": "123 Main St",
+            "tags": [
+                {
+                    "name": "cool_tag",
+                    "number": 42,
+                    "person": {"name": "Alice"},
+                }
+            ],
+        }
+        result = self.form._format_cell_value(address)
+        self.assertEqual(result["type"], "dict")
+        address_by_key = {item["key"]: item for item in result["value"]}
+        tags_item = address_by_key["tags"]
+        self.assertEqual(tags_item["type"], "list")
+        self.assertIs(tags_item["is_json"], False)
+        first_tag = tags_item["value"][0]
+        self.assertEqual(first_tag["type"], "dict")
+        self.assertIs(first_tag["is_json"], False)
+        tag_by_key = {inner["key"]: inner for inner in first_tag["value"]}
+        self.assertEqual(tag_by_key["name"]["value"], "cool_tag")
+        self.assertEqual(tag_by_key["number"]["value"], "42")
+        person_item = tag_by_key["person"]
+        self.assertEqual(person_item["type"], "dict")
+        self.assertIs(person_item["is_json"], False)
+        person_map = {inner["key"]: inner["value"] for inner in person_item["value"]}
+        self.assertEqual(person_map["name"], "Alice")