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

ipfabric_netbox/navigation.py

@@ -3,29 +3,17 @@ from netbox.plugins import PluginMenu
 from netbox.plugins import PluginMenuButton
 from netbox.plugins import PluginMenuItem
 
-
-sync_buttons = [
-    PluginMenuButton(
-        link="plugins:ipfabric_netbox:ipfabricsync_add",
-        title=_("Add"),
-        icon_class="mdi mdi-plus-thick",
-        permissions=["ipfabric_netbox.add_ipfabricsync"],
-    )
-]
-
-source_buttons = [
-    PluginMenuButton(
-        link="plugins:ipfabric_netbox:ipfabricsource_add",
-        title=_("Add"),
-        icon_class="mdi mdi-plus-thick",
-        permissions=["ipfabric_netbox.add_ipfabricsource"],
-    )
-]
-
 source = PluginMenuItem(
     link="plugins:ipfabric_netbox:ipfabricsource_list",
     link_text=_("Sources"),
-    buttons=source_buttons,
+    buttons=[
+        PluginMenuButton(
+            link="plugins:ipfabric_netbox:ipfabricsource_add",
+            title=_("Add"),
+            icon_class="mdi mdi-plus-thick",
+            permissions=["ipfabric_netbox.add_ipfabricsource"],
+        )
+    ],
     permissions=["ipfabric_netbox.view_ipfabricsource"],
 )
 
@@ -35,14 +23,62 @@ snapshot = PluginMenuItem(
     permissions=["ipfabric_netbox.view_ipfabricsnapshot"],
 )
 
-
-ingestion = PluginMenuItem(
+sync = PluginMenuItem(
     link="plugins:ipfabric_netbox:ipfabricsync_list",
     link_text=_("Syncs"),
-    buttons=sync_buttons,
+    buttons=[
+        PluginMenuButton(
+            link="plugins:ipfabric_netbox:ipfabricsync_add",
+            title=_("Add"),
+            icon_class="mdi mdi-plus-thick",
+            permissions=["ipfabric_netbox.add_ipfabricsync"],
+        )
+    ],
     permissions=["ipfabric_netbox.view_ipfabricsync"],
 )
 
+ingestion = PluginMenuItem(
+    link="plugins:ipfabric_netbox:ipfabricingestion_list",
+    link_text=_("Ingestions"),
+    buttons=[],
+    permissions=["ipfabric_netbox.view_ipfabricingestion"],
+)
+
+endpoint = PluginMenuItem(
+    link="plugins:ipfabric_netbox:ipfabricendpoint_list",
+    link_text=_("Endpoints"),
+    permissions=["ipfabric_netbox.view_ipfabricendpoint"],
+    buttons=[],
+)
+
+filter = PluginMenuItem(
+    link="plugins:ipfabric_netbox:ipfabricfilter_list",
+    link_text=_("Filters"),
+    permissions=["ipfabric_netbox.view_ipfabricfilter"],
+    buttons=[
+        PluginMenuButton(
+            link="plugins:ipfabric_netbox:ipfabricfilter_add",
+            title=_("Add"),
+            icon_class="mdi mdi-plus-thick",
+            permissions=["ipfabric_netbox.add_ipfabricfilter"],
+        )
+    ],
+)
+
+filter_expression = PluginMenuItem(
+    link="plugins:ipfabric_netbox:ipfabricfilterexpression_list",
+    link_text=_("Filter Expressions"),
+    permissions=["ipfabric_netbox.view_ipfabricfilterexpression"],
+    buttons=[
+        PluginMenuButton(
+            link="plugins:ipfabric_netbox:ipfabricfilterexpression_add",
+            title=_("Add"),
+            icon_class="mdi mdi-plus-thick",
+            permissions=["ipfabric_netbox.add_ipfabricfilterexpression"],
+        )
+    ],
+)
+
 tmg = PluginMenuItem(
     link="plugins:ipfabric_netbox:ipfabrictransformmapgroup_list",
     link_text=_("Transform Map Groups"),
@@ -70,8 +106,46 @@ tm = PluginMenuItem(
         )
     ],
 )
+
+tmf = PluginMenuItem(
+    link="plugins:ipfabric_netbox:ipfabrictransformfield_list",
+    link_text=_("Transform Fields"),
+    permissions=["ipfabric_netbox.view_ipfabrictransformfield"],
+    buttons=[
+        PluginMenuButton(
+            link="plugins:ipfabric_netbox:ipfabrictransformfield_add",
+            title=_("Add"),
+            icon_class="mdi mdi-plus-thick",
+            permissions=["ipfabric_netbox.add_ipfabrictransformfield"],
+        )
+    ],
+)
+
+tmr = PluginMenuItem(
+    link="plugins:ipfabric_netbox:ipfabricrelationshipfield_list",
+    link_text=_("Relationship Fields"),
+    permissions=["ipfabric_netbox.view_ipfabricrelationshipfield"],
+    buttons=[
+        PluginMenuButton(
+            link="plugins:ipfabric_netbox:ipfabricrelationshipfield_add",
+            title=_("Add"),
+            icon_class="mdi mdi-plus-thick",
+            permissions=["ipfabric_netbox.add_ipfabricrelationshipfield"],
+        )
+    ],
+)
+
 menu = PluginMenu(
     label="IP Fabric",
     icon_class="mdi mdi-cloud-sync",
-    groups=(("IP Fabric", (source, snapshot, ingestion, tmg, tm)),),
+    groups=(
+        (
+            "Data Sync",
+            (source, snapshot, sync, ingestion),
+        ),
+        (
+            "Configuration",
+            (endpoint, filter, filter_expression, tmg, tm, tmf, tmr),
+        ),
+    ),
 )

ipfabric_netbox/tables.py

@@ -1,4 +1,5 @@
 import django_tables2 as tables
+from django.db.models import Count
 from django.utils.html import format_html
 from django.utils.translation import gettext_lazy as _
 from django_tables2 import Column
@@ -7,6 +8,9 @@ from netbox.tables import NetBoxTable
 from netbox_branching.models import ChangeDiff
 
 from .models import IPFabricData
+from .models import IPFabricEndpoint
+from .models import IPFabricFilter
+from .models import IPFabricFilterExpression
 from .models import IPFabricIngestion
 from .models import IPFabricIngestionIssue
 from .models import IPFabricRelationshipField
@@ -42,25 +46,126 @@ DATA_BUTTON = """
     </a>
 """
 
+COMBINED_EXPRESSIONS_BUTTON = """
+    <a href="#"
+          hx-get="{% url 'plugins:ipfabric_netbox:ipfabricfilter_combined_expressions' pk=record.pk %}"
+          hx-target="#htmx-modal-content"
+          data-bs-toggle="modal"
+          data-bs-target="#htmx-modal"
+          class="btn btn-success btn-sm"
+        >
+        Combined
+    </a>
+"""
+
+ENDPOINT_FILTERS_BUTTON = """
+    {% if record.sync_pk %}
+        <a href="#"
+              hx-get="{% url 'plugins:ipfabric_netbox:ipfabricendpoint_filters' pk=record.pk %}?sync_pk={{ record.sync_pk }}&from_sync=true"
+              hx-target="#htmx-modal-content"
+              data-bs-toggle="modal"
+              data-bs-target="#htmx-modal"
+              class="btn btn-success btn-sm"
+            >
+            Show Filters
+        </a>
+    {% else %}
+        <a href="#"
+              hx-get="{% url 'plugins:ipfabric_netbox:ipfabricendpoint_filters' pk=record.pk %}"
+              hx-target="#htmx-modal-content"
+              data-bs-toggle="modal"
+              data-bs-target="#htmx-modal"
+              class="btn btn-success btn-sm"
+            >
+            Show Filters
+        </a>
+    {% endif %}
+"""
+
+
+class IPFabricEndpointTable(NetBoxTable):
+    name = tables.Column(linkify=True)
+    endpoint = tables.Column(verbose_name=_("Endpoint"))
+    filters_count = tables.Column(
+        verbose_name=_("Filters"),
+        empty_values=(),
+        default="",
+        linkify=lambda record: f"/plugins/ipfabric/filter/?endpoint_id={record.pk}",
+    )
+    show_filters = columns.TemplateColumn(
+        template_code=ENDPOINT_FILTERS_BUTTON,
+        orderable=False,
+        verbose_name=_("Combined Filters"),
+        empty_values=(),
+        default="",
+    )
+    actions = None
+
+    def render_filters_count(self, record):
+        """Only render filter count if it's available."""
+        if not hasattr(record, "filters_count"):
+            return ""
+        return record.filters_count
+
+    class Meta(NetBoxTable.Meta):
+        model = IPFabricEndpoint
+        fields = ("name", "description", "endpoint", "filters_count", "show_filters")
+        default_columns = (
+            "name",
+            "description",
+            "endpoint",
+            "filters_count",
+            "show_filters",
+        )
+
 
 class IPFabricRelationshipFieldTable(NetBoxTable):
-    actions = columns.ActionsColumn(actions=("edit", "delete"))
+    id = tables.Column()
+    transform_map = tables.Column(linkify=True)
     source_model = columns.ContentTypeColumn(verbose_name=_("Source Model"))
+    actions = columns.ActionsColumn(actions=("edit", "delete"))
 
     class Meta(NetBoxTable.Meta):
         model = IPFabricRelationshipField
-        fields = ("source_model", "target_field", "coalesce", "actions")
-        default_columns = ("source_model", "target_field", "coalesce", "actions")
+        fields = (
+            "id",
+            "transform_map",
+            "source_model",
+            "target_field",
+            "coalesce",
+            "actions",
+        )
+        default_columns = (
+            "transform_map",
+            "source_model",
+            "target_field",
+            "coalesce",
+            "actions",
+        )
 
 
 class IPFabricTransformFieldTable(NetBoxTable):
     id = tables.Column()
+    transform_map = tables.Column(linkify=True)
     actions = columns.ActionsColumn(actions=("edit", "delete"))
 
     class Meta(NetBoxTable.Meta):
         model = IPFabricTransformField
-        fields = ("id", "source_field", "target_field", "coalesce", "actions")
-        default_columns = ("source_field", "target_field", "coalesce", "actions")
+        fields = (
+            "id",
+            "transform_map",
+            "source_field",
+            "target_field",
+            "coalesce",
+            "actions",
+        )
+        default_columns = (
+            "transform_map",
+            "source_field",
+            "target_field",
+            "coalesce",
+            "actions",
+        )
 
 
 class IPFabricTransformMapGroupTable(NetBoxTable):
@@ -79,13 +184,47 @@ class IPFabricTransformMapGroupTable(NetBoxTable):
 
 class IPFabricTransformMapTable(NetBoxTable):
     name = tables.Column(linkify=True)
+    parents = tables.Column(linkify=False, verbose_name=_("Hierarchical Parents"))
     group = tables.Column(linkify=True)
+    source_endpoint = tables.Column(linkify=True)
     target_model = columns.ContentTypeColumn(verbose_name=_("Target Model"))
 
+    def render_parents(self, record):
+        """Render multiple parents as comma-separated list with links."""
+        parents = record.parents.all()
+        if not parents.exists():
+            return "---"
+
+        parent_links = []
+        for parent in parents:
+            url = parent.get_absolute_url()
+            parent_links.append(format_html('<a href="{}">{}</a>', url, parent.name))
+
+        # Join the SafeStrings directly
+        return format_html(", ".join(str(link) for link in parent_links))
+
+    def order_parents(self, queryset, is_descending):
+        """Order by count of parents."""
+
+        queryset = queryset.annotate(parent_count=Count("parents"))
+
+        if is_descending:
+            queryset = queryset.order_by("-parent_count")
+        else:
+            queryset = queryset.order_by("parent_count")
+
+        return queryset, True
+
     class Meta(NetBoxTable.Meta):
         model = IPFabricTransformMap
-        fields = ("name", "group", "source_model", "target_model")
-        default_columns = ("name", "group", "source_model", "target_model")
+        fields = ("name", "parents", "group", "source_endpoint", "target_model")
+        default_columns = (
+            "name",
+            "parents",
+            "group",
+            "source_endpoint",
+            "target_model",
+        )
 
 
 class IPFabricIngestionTable(NetBoxTable):
@@ -107,8 +246,8 @@ class IPFabricIngestionTable(NetBoxTable):
 
     class Meta(NetBoxTable.Meta):
         model = IPFabricIngestion
-        fields = ("name", "sync", "branch", "description", "user", "changes")
-        default_columns = ("name", "sync", "branch", "description", "user", "changes")
+        fields = ("name", "sync", "branch", "user", "changes")
+        default_columns = ("name", "sync", "branch", "user", "changes")
 
 
 class IPFabricSnapshotTable(NetBoxTable):
@@ -257,6 +396,52 @@ class IPFabricIngestionIssuesTable(NetBoxTable):
         order_by = "id"
 
 
+class IPFabricFilterTable(NetBoxTable):
+    name = tables.Column(linkify=True)
+    endpoints = tables.ManyToManyColumn(linkify_item=True)
+    filter_type = columns.ChoiceFieldColumn(verbose_name=_("Filter Type"))
+    syncs = tables.ManyToManyColumn(linkify_item=True)
+    expressions = columns.ManyToManyColumn(
+        linkify_item=True, verbose_name=_("Filter Expressions")
+    )
+    combined = columns.TemplateColumn(
+        template_code=COMBINED_EXPRESSIONS_BUTTON,
+        orderable=False,
+        verbose_name=_("Combined"),
+    )
+
+    class Meta(NetBoxTable.Meta):
+        model = IPFabricFilter
+        fields = (
+            "name",
+            "description",
+            "endpoints",
+            "filter_type",
+            "syncs",
+            "expressions",
+            "combined",
+        )
+        default_columns = (
+            "name",
+            "endpoints",
+            "filter_type",
+            "syncs",
+            "expressions",
+            "combined",
+        )
+
+
+class IPFabricFilterExpressionTable(NetBoxTable):
+    name = tables.Column(linkify=True)
+    expression = tables.Column(verbose_name=_("Filter Expression"))
+    filters = tables.ManyToManyColumn(linkify_item=True)
+
+    class Meta(NetBoxTable.Meta):
+        model = IPFabricFilterExpression
+        fields = ("name", "description", "filters", "expression")
+        default_columns = ("name", "filters", "expression")
+
+
 class DeviceIPFTable(tables.Table):
     hostname = Column()
 

ipfabric_netbox/templates/ipfabric_netbox/htmx_list.html

@@ -0,0 +1,5 @@
+{% extends 'generic/object_list.html' %}
+
+{% block modals %}
+  {% include 'inc/htmx_modal.html' %}
+{% endblock modals %}

ipfabric_netbox/templates/ipfabric_netbox/inc/combined_expressions.html

@@ -0,0 +1,59 @@
+{% load i18n %}
+<div class="modal-content" id="htmx-modal-content">
+<div class="modal-header">
+    <h5 class="modal-title">
+        {% if context_type == "endpoint" %}
+            {% blocktrans %}Combined Filters for Endpoint: {{ object.name }}{% endblocktrans %}
+            <br>
+            <small class="text-muted">
+                {% trans "Endpoint:" %} {{ object.endpoint }} |
+                {% trans "Sync:" %} {{ sync.name }} (ID: {{ sync.pk }})
+            </small>
+        {% elif context_type == "endpoint_all" %}
+            {% blocktrans %}All Filters for Endpoint: {{ object.name }}{% endblocktrans %}
+            <br>
+            <small class="text-muted">
+                {% trans "Endpoint:" %} {{ object.endpoint }}
+            </small>
+        {% else %}
+            {% blocktrans %}Combined Expressions - {{ object.name }}{% endblocktrans %}
+            <small class="text-muted">(ID: {{ object.pk }})</small>
+        {% endif %}
+    </h5>
+    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+</div>
+<div class="modal-body">
+    <div class="row mb-3">
+        <div class="col-12">
+            <div class="card">
+                <h5 class="card-header">
+                    {% if context_type == "endpoint" or context_type == "endpoint_all" %}
+                        {% trans "Combined Filters" %}: {{ object.endpoint }}
+                    {% else %}
+                        {% trans "Merged Filter Expressions for filter type" %}: {{ object.filter_type|upper }}
+                    {% endif %}
+                </h5>
+                <div class="card-body">
+                    {% if is_empty %}
+                        <div class="alert alert-info" role="alert">
+                            <i class="mdi mdi-information"></i>
+                            {% if context_type == "endpoint" %}
+                                {% trans "No filters are applied to this endpoint in this sync." %}
+                            {% elif context_type == "endpoint_all" %}
+                                {% trans "No filters are using this endpoint." %}
+                            {% else %}
+                                {% trans "No expressions defined for this filter." %}
+                            {% endif %}
+                        </div>
+                    {% else %}
+                        <pre>{{ combined_expressions | json }}</pre>
+                    {% endif %}
+                </div>
+            </div>
+      </div>
+    </div>
+</div>
+
+<div class="modal-footer">
+</div>
+</div>

ipfabric_netbox/templates/ipfabric_netbox/inc/combined_expressions_content.html

@@ -0,0 +1,39 @@
+{% load i18n %}
+<div class="row mb-3">
+    <div class="col-12">
+        <div class="card">
+            <h5 class="card-header">
+                {% if object %}
+                    {% if context_type == "endpoint" or context_type == "endpoint_all" %}
+                        {% trans "Combined Filters" %}: {{ object.endpoint }}
+                        {% if sync %}
+                            <small class="text-muted">&nbsp;- {% trans "Sync:" %} {{ sync.name }} (ID: {{ sync.pk }})</small>
+                        {% else %}
+                            <small class="text-muted">&nbsp;- {% trans "All Syncs" %}</small>
+                        {% endif %}
+                    {% else %}
+                        {% trans "Merged Filter Expressions for filter type" %}: {{ object.filter_type|upper }}
+                    {% endif %}
+                {% else %}
+                    {% trans "Combined Filters" %}
+                {% endif %}
+            </h5>
+            <div class="card-body">
+                {% if is_empty %}
+                    <div class="alert alert-info" role="alert">
+                        <i class="mdi mdi-information"></i>
+                        {% if context_type == "endpoint" %}
+                            {% trans "No filters are applied to this endpoint in this sync." %}
+                        {% elif context_type == "endpoint_all" %}
+                            {% trans "No filters are using this endpoint." %}
+                        {% else %}
+                            {% trans "No expressions defined for this filter." %}
+                        {% endif %}
+                    </div>
+                {% else %}
+                    <pre>{{ combined_expressions | json }}</pre>
+                {% endif %}
+            </div>
+        </div>
+    </div>
+</div>

ipfabric_netbox/templates/ipfabric_netbox/inc/endpoint_filters_with_selector.html

@@ -0,0 +1,54 @@
+{% load i18n %}
+<div class="modal-content" id="htmx-modal-content">
+<div class="modal-header">
+    <h5 class="modal-title">
+        {% if object %}
+            {% blocktrans %}Filters for Endpoint: {{ object.name }}{% endblocktrans %}
+            <br>
+            <small class="text-muted">
+                {% trans "Endpoint:" %} {{ object.endpoint }}
+            </small>
+        {% else %}
+            {% trans "Endpoint Filters" %}
+        {% endif %}
+    </h5>
+    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+</div>
+<div class="modal-body">
+    {% if object %}
+        <div class="row mb-3">
+            <div class="col-12">
+                <div class="form-group">
+                    <label for="sync-selector">{% trans "Select Sync:" %}</label>
+                    <select id="sync-selector"
+                            class="form-select"
+                            hx-get="{% url 'plugins:ipfabric_netbox:ipfabricendpoint_filters' pk=object.pk %}"
+                            hx-target="#filters-content"
+                            hx-include="#sync-selector"
+                            hx-swap="innerHTML"
+                            name="sync_pk">
+                        <option value="">{% trans "All Syncs" %}</option>
+                        {% for sync in available_syncs %}
+                            <option value="{{ sync.pk }}" {% if selected_sync_pk == sync.pk %}selected{% endif %}>
+                                {{ sync.name }} (ID: {{ sync.pk }})
+                            </option>
+                        {% endfor %}
+                    </select>
+                </div>
+            </div>
+        </div>
+
+        <div id="filters-content">
+            {% include "ipfabric_netbox/inc/combined_expressions_content.html" %}
+        </div>
+    {% else %}
+        <div class="alert alert-info" role="alert">
+            <i class="mdi mdi-information"></i>
+            {% trans "This view requires an HTMX request." %}
+        </div>
+    {% endif %}
+</div>
+
+<div class="modal-footer">
+</div>
+</div>

ipfabric_netbox/templates/ipfabric_netbox/ipfabricendpoint.html

@@ -0,0 +1,39 @@
+{% extends 'generic/object.html' %}
+{% load static %}
+{% load helpers %}
+{% load plugins %}
+{% load render_table from django_tables2 %}
+{% load i18n %}
+
+{% block content %}
+<div class="row mb-3">
+  <div class="col col-md-6">
+    <div class="card">
+      <h5 class="card-header">{% trans "Endpoint Information" %}</h5>
+      <div class="card-body">
+        <table class="table table-hover attr-table">
+          <tr>
+            <th scope="row">{% trans "Name" %}</th>
+            <td>{{ object.name }}</td>
+          </tr>
+          <tr>
+            <th scope="row">{% trans "Description" %}</th>
+            <td>{{ object.description | placeholder }}</td>
+          </tr>
+          <tr>
+            <th scope="row">{% trans "Endpoint" %}</th>
+            <td>{{ object.endpoint | placeholder }}</td>
+          </tr>
+        </table>
+      </div>
+    </div>
+    {% plugin_left_page object %}
+  </div>
+  <div class="col col-12 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>
+</div>
+{% endblock %}

ipfabric_netbox/templates/ipfabric_netbox/ipfabricfilter.html

@@ -0,0 +1,51 @@
+{% extends 'generic/object.html' %}
+{% load static %}
+{% load helpers %}
+{% load plugins %}
+{% load render_table from django_tables2 %}
+{% load i18n %}
+
+{% block extra_controls %}
+  <a href="#"
+     hx-get="{% url 'plugins:ipfabric_netbox:ipfabricfilter_combined_expressions' pk=object.pk %}"
+     hx-target="#htmx-modal-content"
+     data-bs-toggle="modal"
+     data-bs-target="#htmx-modal"
+     class="btn btn-primary"
+  >
+    <i class="mdi mdi-filter-variant"></i> {% trans "Combined Expressions" %}
+  </a>
+{% endblock %}
+
+{% block content %}
+<div class="row mb-3">
+  <div class="col col-md-6">
+    <div class="card">
+      <h5 class="card-header">{% trans "Filter Information" %}</h5>
+      <div class="card-body">
+        <table class="table table-hover attr-table">
+          <tr>
+            <th scope="row">{% trans "Name" %}</th>
+            <td>{{ object.name }}</td>
+          </tr>
+          <tr>
+            <th scope="row">{% trans "Description" %}</th>
+            <td>{{ object.description | placeholder }}</td>
+          </tr>
+          <tr>
+            <th scope="row">{% trans "Filter Type" %}</th>
+            <td>{{ object.filter_type.upper | placeholder }}</td>
+          </tr>
+        </table>
+      </div>
+    </div>
+    {% plugin_left_page object %}
+  </div>
+  <div class="col col-12 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>
+</div>
+{% endblock %}