ipfabric_netbox 4.3.2b9__py3-none-any.whl → 4.3.2b10__py3-none-any.whl

ipfabric_netbox/templates/ipfabric_netbox/ipfabricfilterexpression_edit.html

@@ -0,0 +1,150 @@
+{% extends 'generic/object_edit.html' %}
+{% load static %}
+{% load form_helpers %}
+{% load i18n %}
+
+{% block form %}
+    {# Render hidden fields #}
+    {% for field in form.hidden_fields %}
+        {{ field }}
+    {% endfor %}
+
+    {# Render regular fieldsets #}
+    {% for fieldset in form.fieldsets %}
+        {% if fieldset.name != "Test Expression" %}
+            {% render_fieldset form fieldset %}
+        {% else %}
+            {# Custom rendering for Test Expression fieldset with button #}
+            <div class="bg-info-subtle border border-info rounded-1 pt-3 px-3 mb-3">
+                <div class="field-group mb-3">
+                    <div class="row">
+                        <h2 class="col-9 offset-3">
+                            {% trans "Test Expression" %}
+                        </h2>
+                        <p class="text-muted small mb-3  offset-3">
+                                Test this filter expression against a live IP Fabric source to verify it returns the expected results.
+                            </p>
+                    </div>
+
+
+
+                    {# Render the fields in this fieldset (test_source and test_endpoint) #}
+                    {% render_field form.test_source %}
+                    {% render_field form.test_endpoint %}
+                </div>
+
+                {# Test button section #}
+                <div class="mb-3">
+                    <div class="row">
+                        <div class="col-9 offset-3">
+                            <button type="button"
+                                    id="test-expression-btn"
+                                    class="btn btn-primary"
+                                    onclick="testExpression('{{ object.pk|default:"" }}', '{{ csrf_token }}')">
+                                 {% trans "Test Expression" %}
+                            </button>
+
+                            <div id="test-result" class="mt-3"></div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        {% endif %}
+    {% endfor %}
+
+    {# Custom fields #}
+    {% if form.custom_fields %}
+        <div class="field-group mb-5">
+            <div class="row">
+                <h2 class="col-9 offset-3">{% trans "Custom Fields" %}</h2>
+            </div>
+            {% render_custom_fields form %}
+        </div>
+    {% endif %}
+
+    {# Comments #}
+    {% if form.comments %}
+        <div class="field-group mb-5">
+            {% render_field form.comments %}
+        </div>
+    {% endif %}
+
+    {# Changelog message #}
+    {% if form.changelog_message %}
+        <div class="bg-primary-subtle border border-primary rounded-1 pt-3 px-3 mb-3">
+            {% render_field form.changelog_message %}
+        </div>
+    {% endif %}
+
+    {# Load JavaScript for AJAX testing - inlined to ensure it's always available #}
+    <script>
+    /**
+     * Test filter expression against IP Fabric API
+     */
+    function testExpression(pk, csrfToken) {
+        const btn = document.getElementById('test-expression-btn');
+        const result = document.getElementById('test-result');
+        const testSource = document.getElementById('id_test_source')?.value;
+        const testEndpoint = document.getElementById('id_test_endpoint')?.value;
+        const expression = document.getElementById('id_expression')?.value;
+
+        // Clear any previous result message
+        result.innerHTML = '';
+
+        // Validate required fields
+        if (!testSource) {
+            result.innerHTML = '<div class="alert alert-warning"><strong>Required:</strong> Please select a Test Source.</div>';
+            return;
+        }
+
+        if (!testEndpoint) {
+            result.innerHTML = '<div class="alert alert-warning"><strong>Required:</strong> Please select a Test Endpoint.</div>';
+            return;
+        }
+
+        if (!expression) {
+            result.innerHTML = '<div class="alert alert-warning"><strong>Required:</strong> Please enter an expression to test.</div>';
+            return;
+        }
+
+        // Show loading
+        btn.disabled = true;
+        btn.innerHTML = '<i class="mdi mdi-loading mdi-spin"></i> Testing...';
+
+        // Use the same endpoint logic for both saved and unsaved expressions
+        const url = pk
+            ? `/plugins/ipfabric/filter-expression/${pk}/test/`
+            : `/plugins/ipfabric/filter-expression/test/`;
+
+        // Make AJAX request
+        fetch(url, {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/x-www-form-urlencoded',
+                'X-CSRFToken': csrfToken
+            },
+            body: new URLSearchParams({
+                test_source: testSource,
+                test_endpoint: testEndpoint,
+                expression: expression
+            })
+        })
+        .then(response => response.json())
+        .then(data => {
+            btn.disabled = false;
+            btn.innerHTML = '<i class="mdi mdi-test-tube"></i> {% trans "Test Expression" %}';
+
+            if (data.success) {
+                result.innerHTML = `<div class="alert alert-success"><strong>Success!</strong> ${data.message}</div>`;
+            } else {
+                result.innerHTML = `<div class="alert alert-danger"><strong>Error:</strong> ${data.error}</div>`;
+            }
+        })
+        .catch(error => {
+            btn.disabled = false;
+            btn.innerHTML = '<i class="mdi mdi-test-tube"></i> {% trans "Test Expression" %}';
+            result.innerHTML = `<div class="alert alert-danger"><strong>Error:</strong> ${error.message}</div>`;
+        });
+    }
+    </script>
+{% endblock form %}

ipfabric_netbox/templates/ipfabric_netbox/ipfabricsync.html

@@ -81,7 +81,7 @@
       <h5 class="card-header">{% trans "Parameters" %}</h5>
       <div class="card-body">
         <table class="table table-hover attr-table">
-          {% for name, field in object.parameters.items %}
+          {% for name, field in object.parameters|sort_parameters_hierarchical:object %}
             <tr>
               <th scope="row">{{ name }}</th>
               <td>

ipfabric_netbox/templates/ipfabric_netbox/ipfabrictransformmap.html

@@ -33,8 +33,20 @@
             <td>{{ object.group | linkify | placeholder}}</td>
           </tr>
           <tr>
-            <th scope="row">{% trans "Source Model" %}</th>
-            <td>ipfabric | {{ object.source_model }}</td>
+            <th scope="row">{% trans "Parent Transform Maps" %}</th>
+            <td>
+              {% if object.parents.exists %}
+                {% for parent in object.parents.all %}
+                  <a href="{{ parent.get_absolute_url }}">{{ parent.name }}</a>{% if not forloop.last %}, {% endif %}
+                {% endfor %}
+              {% else %}
+                <span class="text-muted">{{ "" | placeholder }}</span>
+              {% endif %}
+            </td>
+          </tr>
+          <tr>
+            <th scope="row">{% trans "Source Endpoint" %}</th>
+            <td>{{ object.source_endpoint | linkify }}</td>
           </tr>
           <tr>
             <th scope="row">{% trans "Target Model" %}</th>
@@ -46,6 +58,8 @@
     {% plugin_left_page object %}
   </div>
   <div class="col col-md-6">
+    {% include 'inc/panels/related_objects.html' %}
+    {% include 'inc/panels/comments.html' %}
     {% include 'inc/panels/custom_fields.html' %}
     {% plugin_right_page object %}
   </div>

ipfabric_netbox/templatetags/ipfabric_netbox_helpers.py

@@ -1,8 +1,17 @@
+import logging
+from collections import OrderedDict
+from typing import TYPE_CHECKING
+
 from django import template
 from django.apps import apps
 
+if TYPE_CHECKING:
+    from ipfabric_netbox.models import IPFabricSync
+
 register = template.Library()
 
+logger = logging.getLogger("ipfabric_netbox.helpers")
+
 
 @register.filter()
 def resolve_object(pk, model_path):
@@ -15,3 +24,59 @@ def resolve_object(pk, model_path):
         return model.objects.get(pk=pk)
     except Exception:
         return None
+
+
+@register.filter()
+def sort_parameters_hierarchical(
+    parameters_dict: dict, sync_obj: "IPFabricSync | None" = None
+) -> list:
+    """
+    Sort parameters hierarchically for IPFabricSync objects:
+    1. 'groups' first
+    2. Models in hierarchical order from IPFabricSync.get_model_hierarchy()
+
+    For other objects, returns items unsorted.
+
+    Usage: {{ object.parameters|sort_parameters_hierarchical:object }}
+    """
+    if not parameters_dict or not isinstance(parameters_dict, dict):
+        return []
+
+    try:
+        group_ids = parameters_dict.get("groups", [])
+
+        # Get the hierarchical model order from IPFabricSync
+        model_hierarchy = sync_obj.__class__.get_model_hierarchy(group_ids)
+        # Convert ContentType objects to app_label.model format
+        hierarchy_order = [f"{ct.app_label}.{ct.model}" for ct in model_hierarchy]
+
+        # Group models by app label while maintaining hierarchical order
+        app_models = OrderedDict()
+        for model_name in hierarchy_order:
+            if "." in model_name:
+                app_label = model_name.split(".")[0]
+                if app_label not in app_models:
+                    app_models[app_label] = []
+                app_models[app_label].append(model_name)
+
+        # Build sorted list: groups first, then all app models
+        sorted_keys = []
+        for app_label, models in app_models.items():
+            sorted_keys.extend(models)
+
+        result = []
+        # Start with keys that weren't in the hierarchy
+        for key, value in parameters_dict.items():
+            if key not in sorted_keys:
+                result.append((key, value))
+
+        # Return items in the sorted order
+        for key in sorted_keys:
+            if key in parameters_dict:
+                result.append((key, parameters_dict[key]))
+
+        return result
+    except Exception:
+        # Fallback to simple alphabetical sort if something goes wrong
+        logger.warning("Failed to sort parameters hierarchically", exc_info=True)
+        return sorted(parameters_dict.items())