jsonschema_validation: Add additional properties UI

#99 0.8.3 of libcoveofds needed for this
Open-Telecoms-Data · Jun 28, 2023 · 23e7d7d · 23e7d7d
1 parent 0eb06e6
commit 23e7d7d
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 0 deletions.
diff --git a/cove_ofds/jsonschema_validation_errors.py b/cove_ofds/jsonschema_validation_errors.py
@@ -56,6 +56,9 @@ def add_type_to_json_schema_validation_error(data: dict) -> dict:
     elif data["validator"] == "minProperties":
         data["cove_type"] = "Emptyobject"
 
+    elif data["validator"] == "additionalProperties":
+        data["cove_type"] = "Additionalproperties"
+
     elif data["validator"] == "format" and data["validator_value"] == "date":
         data["cove_type"] = "Incorrectlyformatteddate"
 

diff --git a/cove_ofds/templates/cove_ofds/jsonschema_validation_panel.html b/cove_ofds/templates/cove_ofds/jsonschema_validation_panel.html
@@ -194,6 +194,18 @@ <h4 class="validation-title">
     {% include "cove_ofds/jsonschema_validation_table.html" with validation_errors_for_table=validation_errors.Incorrectlyformatteduuid col_instance=True error_table_id="Incorrectlyformatteduuid" %}
 {% endif %}
 
+{% if 'Additionalproperties' in validation_errors %}
+    <h4 class="validation-title">
+      {% trans 'Additional properties within Geometry object' %}
+      {% include 'cove_ofds/jsonschema_validation_table_error_counter.html' with count=validation_errors.Additionalproperties|length error_table_id="Additionalproperties" %}
+    </h4>
+    <p>
+        Additional properties are not permitted within Geometry objects. You must remove any additional properties.
+        For more information, see <a href="https://open-fibre-data-standard.readthedocs.io/en/latest/reference/schema.html#geometry" target="_blank">Geometry</a>.
+    </p>
+    {% include "cove_ofds/jsonschema_validation_table.html" with validation_errors_for_table=validation_errors.Additionalproperties error_table_id="Additionalproperties" col_extra_additional_properties=True %}
+{% endif %}
+
 
 {% if 'unknown' in validation_errors %}
     <h4 class="validation-title">

diff --git a/cove_ofds/templates/cove_ofds/jsonschema_validation_table.html b/cove_ofds/templates/cove_ofds/jsonschema_validation_table.html
@@ -13,6 +13,9 @@
             {% if col_validator_value %}
                 <th>{{ col_validator_value_label }}</Th>
             {% endif %}
+            {% if col_extra_additional_properties %}
+                <th>{% trans 'Additional properties' %}</th>
+            {% endif %}
         </tr>
         </thead>
         <tbody>
@@ -46,6 +49,13 @@
                         {% include "libcoveweb2/show_json_value.html" with value=error.validator_value %}
                     </td>
                 {% endif %}
+                {% if col_extra_additional_properties %}
+                    <td>
+                        {% for a_p in error.extra.additional_properties %}
+                            <div>{{ a_p }}</div>
+                        {% endfor %}
+                    </td>
+                {% endif %}
             </tr>
         {% endfor %}
         </tbody>