ipfabric_netbox 4.3.2b2__tar.gz → 4.3.2b4__tar.gz

{ipfabric_netbox-4.3.2b2 → ipfabric_netbox-4.3.2b4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ipfabric_netbox
-Version: 4.3.2b2
+Version: 4.3.2b4
 Summary: NetBox plugin to sync IP Fabric data into NetBox
 License: MIT
 Keywords: netbox,ipfabric,plugin,sync

{ipfabric_netbox-4.3.2b2 → ipfabric_netbox-4.3.2b4}/ipfabric_netbox/__init__.py

@@ -6,7 +6,7 @@ class NetboxIPFabricConfig(PluginConfig):
     name = "ipfabric_netbox"
     verbose_name = "NetBox IP Fabric SoT Plugin"
     description = "Sync IP Fabric into NetBox"
-    version = "4.3.2b2"
+    version = "4.3.2b4"
     base_url = "ipfabric"
     min_version = "4.4.0"
 

{ipfabric_netbox-4.3.2b2 → ipfabric_netbox-4.3.2b4}/ipfabric_netbox/tables.py

@@ -89,7 +89,7 @@ class IPFabricTransformMapTable(NetBoxTable):
 
 
 class IPFabricIngestionTable(NetBoxTable):
-    name = tables.Column(linkify=True)
+    name = tables.Column(linkify=True, order_by=("branch_name", "sync_name", "id"))
     sync = tables.Column(verbose_name=_("IP Fabric Sync"), linkify=True)
     branch = tables.Column(linkify=True)
     changes = tables.Column(
@@ -97,6 +97,14 @@ class IPFabricIngestionTable(NetBoxTable):
     )
     actions = columns.ActionsColumn(actions=("delete",))
 
+    def render_name(self, record):
+        if getattr(record, "branch_name", None):
+            return record.branch_name
+        elif getattr(record, "sync_name", None):
+            return f"{record.sync_name} (Ingestion {record.pk})"
+        else:
+            return f"Ingestion {record.pk} (No Sync)"
+
     class Meta(NetBoxTable.Meta):
         model = IPFabricIngestion
         fields = ("name", "sync", "branch", "description", "user", "changes")
@@ -158,6 +166,7 @@ class IPFabricSyncTable(NetBoxTable):
         accessor="last_ingestion",
         verbose_name=_("Last Ingestion"),
         linkify=True,
+        order_by="last_ingestion_pk",
     )
 
     def render_last_ingestion(self, value: IPFabricIngestion):
@@ -190,8 +199,9 @@ class IPFabricIngestionChangesTable(NetBoxTable):
     object_type = tables.Column(
         accessor="object_type.model", verbose_name=_("Object Type")
     )
-    object = tables.Column(verbose_name=_("Object"))
-    actions = columns.TemplateColumn(template_code=DIFF_BUTTON)
+    object = tables.Column(verbose_name=_("Object"), order_by="object_repr")
+    actions = None
+    diffs = columns.TemplateColumn(template_code=DIFF_BUTTON, orderable=False)
 
     def render_object(self, value, record):
         model_templates = {
@@ -213,7 +223,7 @@ class IPFabricIngestionChangesTable(NetBoxTable):
         if value and (class_name := value.__class__.__name__) in model_templates:
             field_value = model_templates[class_name](value)
             if url := value.get_absolute_url():
-                return format_html("<a href={}>{}</a>", url, field_value)
+                return format_html("<a href='{}'>{}</a>", url, field_value)
         else:
             field_value = record.object_repr
         return field_value
@@ -221,8 +231,8 @@ class IPFabricIngestionChangesTable(NetBoxTable):
     class Meta(NetBoxTable.Meta):
         model = ChangeDiff
         name = "staged_changes"
-        fields = ("object", "action", "object_type", "actions")
-        default_columns = ("object", "action", "object_type", "actions")
+        fields = ("object", "action", "object_type", "diffs")
+        default_columns = ("object", "action", "object_type", "diffs")
 
 
 class IPFabricIngestionIssuesTable(NetBoxTable):

{ipfabric_netbox-4.3.2b2 → ipfabric_netbox-4.3.2b4}/ipfabric_netbox/templates/ipfabric_netbox/inc/diff.html

@@ -9,7 +9,7 @@
     <div class="row mb-3">
         <div class="col-6">
             <div class="card">
-                <h5 class="card-header">%{ trans "Pre-Change Data" %}</h5>
+                <h5 class="card-header">{% trans "Pre-Change Data" %}</h5>
                 <div class="card-body">
                     {% if prechange_data %}
                     <pre class="change-data">{% for k, v in prechange_data.items %}{% spaceless %}
@@ -17,14 +17,14 @@
                     {% endspaceless %}{% endfor %}
                 </pre>
                     {% else %}
-                    <span class="text-muted">%{ trans "None" %}</span>
+                    <span class="text-muted">{% trans "None" %}</span>
                     {% endif %}
                 </div>
             </div>
         </div>
         <div class="col-6">
             <div class="card">
-                <h5 class="card-header">%{ trans "Post-Change Data" %}</h5>
+                <h5 class="card-header">{% trans "Post-Change Data" %}</h5>
                 <div class="card-body">
                     {% if postchange_data %}
                     <pre class="change-data">{% for k, v in postchange_data.items %}{% spaceless %}
@@ -38,7 +38,7 @@
         <div class="col">
             <div class="card">
                 <div class="card-header">
-                    <h5 class="d-inline">%{ trans "Difference" %}</h5>
+                    <h5 class="d-inline">{% trans "Difference" %}</h5>
                     <!-- <div class="btn-group btn-group-sm float-end noprint">
                             <a {% if prev_change %}href="{% url 'extras:objectchange' pk=prev_change.pk %}"{% else %}disabled{% endif %} class="btn btn-outline-secondary">
                                 <i class="mdi mdi-chevron-left" aria-hidden="true"></i> Previous
@@ -52,11 +52,11 @@
                     {% if diff_added == diff_removed %}
                     <span class="text-muted" style="margin-left: 10px;">
                         {% if object.action == 'create' %}
-                        %{ trans "Object Created" %}
+                        {% trans "Object Created" %}
                         {% elif object.action == 'delete' %}
-                        %{ trans "Object Deleted" %}
+                        {% trans "Object Deleted" %}
                         {% else %}
-                        %{ trans "No Changes" %}
+                        {% trans "No Changes" %}
                         {% endif %}
                     </span>
                     {% else %}

{ipfabric_netbox-4.3.2b2 → ipfabric_netbox-4.3.2b4}/ipfabric_netbox/templates/ipfabric_netbox/ipfabricsnapshot.html

@@ -18,7 +18,7 @@
   <div class="row mb-3">
     <div class="col col-md-6">
       <div class="card">
-        <h5 class="card-header">{% trans "Snapshot Information</h5>
+        <h5 class="card-header">{% trans "Snapshot Information" %}</h5>
         <div class="card-body">
           <table class="table table-hover attr-table">
             <tr>

{ipfabric_netbox-4.3.2b2 → ipfabric_netbox-4.3.2b4}/ipfabric_netbox/views.py

@@ -727,7 +727,13 @@ class IPFabricSourceTopology(LoginRequiredMixin, View):
 # region - Sync
 @register_model_view(IPFabricSync, "list", path="", detail=False)
 class IPFabricSyncListView(generic.ObjectListView):
-    queryset = IPFabricSync.objects.all()
+    queryset = IPFabricSync.objects.annotate(
+        last_ingestion_pk=models.Subquery(
+            IPFabricIngestion.objects.filter(sync=models.OuterRef("pk"))
+            .order_by("-pk")
+            .values("pk")[:1]
+        )
+    )
     table = IPFabricSyncTable
     filterset = IPFabricSyncFilterSet
     actions = (AddObject, BulkExport, BulkEdit, BulkRename, BulkDelete)
@@ -877,6 +883,8 @@ class IPFabricIngestionTabView(generic.ObjectChildrenView):
             description=models.F("branch__description"),
             user=models.F("sync__user__username"),
             staged_changes=models.Count(models.F("branch__changediff")),
+            branch_name=models.F("branch__name"),
+            sync_name=models.F("sync__name"),
         )
 
 
@@ -890,6 +898,8 @@ class IPFabricIngestionListView(generic.ObjectListView):
         description=models.F("branch__description"),
         user=models.F("sync__user__username"),
         staged_changes=models.Count(models.F("branch__changediff")),
+        branch_name=models.F("branch__name"),
+        sync_name=models.F("sync__name"),
     )
     filterset = IPFabricIngestionFilterSet
     filterset_form = IPFabricIngestionFilterForm

{ipfabric_netbox-4.3.2b2 → ipfabric_netbox-4.3.2b4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "ipfabric_netbox"
-version = "4.3.2b2"
+version = "4.3.2b4"
 description = "NetBox plugin to sync IP Fabric data into NetBox"
 authors = ["Solution Architecture <solution.architecture@ipfabric.io>"]
 license = "MIT"