ipfabric_netbox 4.3.2b3__py3-none-any.whl → 4.3.2b4__py3-none-any.whl

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.2b3"
+    version = "4.3.2b4"
     base_url = "ipfabric"
     min_version = "4.4.0"
 

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/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/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.2b3.dist-info → ipfabric_netbox-4.3.2b4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ipfabric_netbox
-Version: 4.3.2b3
+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.2b3.dist-info → ipfabric_netbox-4.3.2b4.dist-info}/RECORD

@@ -1,4 +1,4 @@
-ipfabric_netbox/__init__.py,sha256=ubD3_CcKoeKzWiGAgw-Jbc6qYADxMkuX4GHa2dTMYK0,674
+ipfabric_netbox/__init__.py,sha256=_2YuNbXcbj5cmGwkoAO6tH70jn9dcyMSSYOGG7UznEw,674
 ipfabric_netbox/api/__init__.py,sha256=XRclTGWVR0ZhAAwgYul5Wm_loug5_hUjEumbLQEwKYM,47
 ipfabric_netbox/api/serializers.py,sha256=92Cwhnqsm1l1oZfdHH5aJI1VFX0eO5JS4BsdXE6Ur18,6738
 ipfabric_netbox/api/urls.py,sha256=1fXXVTxNY5E64Nfz6b7zXD9bZI3FcefuxAWKMe0w_QU,1240
@@ -40,7 +40,7 @@ ipfabric_netbox/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 ipfabric_netbox/models.py,sha256=5bgQzfGfCUWQdRL3j6CNFXVDW3oDfxpQ0Y6JCKRJz-M,39250
 ipfabric_netbox/navigation.py,sha256=g2PyyaMqjgYwO3VIKza8vMS-dhbkvxscsHwVfWBj_dk,2287
 ipfabric_netbox/signals.py,sha256=y3x2jKT8yTjOfC4B3h4YZPRsYQkBal4cFdHJFkbPoS8,1411
-ipfabric_netbox/tables.py,sha256=jXiHcRrR4XwkvyUnnU92JW290nZg-85IdpKjsQOsFcc,9052
+ipfabric_netbox/tables.py,sha256=5zLupcghoeQeQ0SQyMrYQg00cpGzeO9DL4IJ54-b7Fo,9496
 ipfabric_netbox/template_content.py,sha256=lxZ02BFVihbSgjXCETGsWmhdElQUUO3uUGd0WfhlRmw,1120
 ipfabric_netbox/templates/ipfabric_netbox/inc/clone_form.html,sha256=f6O5ugjQg7u37QWxUpKvE38jNslwb3rCMghlAUqjWBk,1127
 ipfabric_netbox/templates/ipfabric_netbox/inc/diff.html,sha256=tuXJdQnesdIF0pUoKoho_8fQTGSIwdoEWhieHu6ikVM,3439
@@ -54,7 +54,7 @@ ipfabric_netbox/templates/ipfabric_netbox/inc/transform_map_field_map.html,sha25
 ipfabric_netbox/templates/ipfabric_netbox/inc/transform_map_relationship_map.html,sha256=tmIV0gDhfVxBse4xDeE5atMi4KEMkvxB_WRx94gu44U,539
 ipfabric_netbox/templates/ipfabric_netbox/ipfabric_table.html,sha256=HsxENF0KaaGT8w0_K6251LVH0W_mg60W8ktApxAG59U,1689
 ipfabric_netbox/templates/ipfabric_netbox/ipfabricingestion.html,sha256=4cUP5KxCEtH4j5RFT68-7UJUCnJcOCxA0iBzrxwua4I,4760
-ipfabric_netbox/templates/ipfabric_netbox/ipfabricsnapshot.html,sha256=HWCGi1e0O_jL-5XnIYfCC5EQh5oSw-1-ZUpjH6-cGV0,3690
+ipfabric_netbox/templates/ipfabric_netbox/ipfabricsnapshot.html,sha256=JzvLqu0lIutCn_2f0alNVOAFbv2P6sqoZ1nYtVL9O8Y,3694
 ipfabric_netbox/templates/ipfabric_netbox/ipfabricsource.html,sha256=I9K7Eob-jjNAy6lryq2QKpp-5JyR1DEJSPF3D6JKR_w,4063
 ipfabric_netbox/templates/ipfabric_netbox/ipfabricsync.html,sha256=M7tig8Y42ndsipBHKVVfSFb9tSGvm7Cf4fj-B54xizs,4852
 ipfabric_netbox/templates/ipfabric_netbox/ipfabrictransformmap.html,sha256=bAau1cqRMUsOWHIxkMP-6ALf7l-6AZSQfh-iPGUPR6U,1560
@@ -82,7 +82,7 @@ ipfabric_netbox/utilities/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 ipfabric_netbox/utilities/ipfutils.py,sha256=wc6wVBEHKJ8RoCOrp6Fm3w08nf1xiHGGMsMYrypOcpA,38852
 ipfabric_netbox/utilities/logging.py,sha256=GYknjocMN6LQ2873_az3y0RKm29TCXaWviUIIneH-x0,3445
 ipfabric_netbox/utilities/transform_map.py,sha256=nJhEdi2DqqowrtfowNgg-FZiE3_lN0MhQvaNwHS4yXw,8979
-ipfabric_netbox/views.py,sha256=CPVtPvHcKCeCAusxjC0WvnOUKn6p5m3lgd57wOp29dI,44829
-ipfabric_netbox-4.3.2b3.dist-info/METADATA,sha256=x5CPFIHt27uvIVjSJ3v38qFptMdLXYyC5y-jA6hNnDY,4789
-ipfabric_netbox-4.3.2b3.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-ipfabric_netbox-4.3.2b3.dist-info/RECORD,,
+ipfabric_netbox/views.py,sha256=nFqb9htUH-D8NXvJcWPb5D5u909rfHMZ4trUbCULafU,45208
+ipfabric_netbox-4.3.2b4.dist-info/METADATA,sha256=VkguZ9nO_GGYGgXxp4xI7qs670Ba-2D0xGRh44GTTV8,4789
+ipfabric_netbox-4.3.2b4.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+ipfabric_netbox-4.3.2b4.dist-info/RECORD,,