Merge branch 'fix_test' into 'main'

Clean up debug, fixed filtering for segments features

See merge request 701/netbox/cesnet_service_path_plugin!32

Author: Kani999

cesnet_service_path_plugin/filtersets/segment.py

@@ -6,6 +6,7 @@
 from extras.filters import TagFilter
 from netbox.filtersets import NetBoxModelFilterSet
 
+
 from cesnet_service_path_plugin.models import Segment
 from cesnet_service_path_plugin.models.custom_choices import StatusChoices
 from cesnet_service_path_plugin.models.segment_types import SegmentTypeChoices
@@ -86,7 +87,7 @@ class SegmentFilterSet(NetBoxModelFilterSet):
     )
 
     # Path data filter
-    has_path_data = django_filters.MultipleChoiceFilter(
+    has_path_data = django_filters.ChoiceFilter(
         choices=[
             (True, "Yes"),
             (False, "No"),
@@ -95,6 +96,16 @@ class SegmentFilterSet(NetBoxModelFilterSet):
         label="Has Path Data",
     )
 
+    # Type specific data filter
+    has_type_specific_data = django_filters.ChoiceFilter(
+        choices=[
+            (True, "Yes"),
+            (False, "No"),
+        ],
+        method="_has_type_specific_data",
+        label="Has Type Specific Data",
+    )
+
     # =============================================================================
     # TYPE-SPECIFIC FILTERS
     # =============================================================================
@@ -218,6 +229,7 @@ class Meta:
             "site_b",
             "location_b",
             "has_path_data",
+            "has_type_specific_data",
         ]
 
     def _at_any_site(self, queryset, name, value):
@@ -239,38 +251,33 @@ def _at_any_location(self, queryset, name, value):
     def _has_path_data(self, queryset, name, value):
         """
         Filter segments based on whether they have path data or not
-
-        Args:
-            value: List of selected values from choices
-                   [True] - show only segments with path data
-                   [False] - show only segments without path data
-                   [True, False] - show all segments (both with and without)
-                   [] - show all segments (nothing selected)
         """
-        if not value:
+        if value in (None, "", []):
             # Nothing selected, show all segments
             return queryset
 
-        # Convert string values to boolean (django-filter sometimes passes strings)
-        bool_values = []
-        for v in value:
-            if v is True or v == "True" or v:
-                bool_values.append(True)
-            elif v is False or v == "False" or not v:
-                bool_values.append(False)
+        has_data = value in [True, "True", "true", "1"]
 
-        if True in bool_values and False in bool_values:
-            # Both selected, show all segments
-            return queryset
-        elif True in bool_values:
+        if has_data:
             # Only "Yes" selected, show segments with path data
             return queryset.filter(path_geometry__isnull=False)
-        elif False in bool_values:
+        else:
             # Only "No" selected, show segments without path data
             return queryset.filter(path_geometry__isnull=True)
+
+    def _has_type_specific_data(self, queryset, name, value):
+        """Filter segments by whether they have type-specific data"""
+        if value == "" or value is None:
+            return queryset  # No filtering
+
+        has_data = value in [True, "True", "true", "1"]
+
+        if has_data:
+            # Has data: exclude null and empty dict
+            return queryset.exclude(Q(type_specific_data__isnull=True) | Q(type_specific_data={}))
         else:
-            # Fallback: show all segments
-            return queryset
+            # No data: include null or empty dict
+            return queryset.filter(Q(type_specific_data__isnull=True) | Q(type_specific_data={}))
 
     def _parse_smart_numeric_value(self, value, field_type="float"):
         """

cesnet_service_path_plugin/forms/segment.py

@@ -454,16 +454,28 @@ class SegmentFilterForm(NetBoxModelFilterSetForm):
         label=_("Circuits"),
     )
 
-    has_path_data = forms.MultipleChoiceField(
+    has_path_data = forms.ChoiceField(
         required=False,
         choices=[
+            ("", "Any"),
             (True, "Yes"),
             (False, "No"),
         ],
         label=_("Has Path Data"),
         help_text="Filter segments that have path geometry data",
     )
 
+    has_type_specific_data = forms.ChoiceField(
+        required=False,
+        choices=[
+            ("", "Any"),
+            (True, "Yes"),
+            (False, "No"),
+        ],
+        label=_("Has Type-Specific Data"),
+        help_text="Filter segments that have type-specific data defined",
+    )
+
     # =============================================================================
     # TYPE-SPECIFIC FILTER FIELDS - SIMPLIFIED (NO SmartNumericField needed)
     # =============================================================================
@@ -620,7 +632,9 @@ class SegmentFilterForm(NetBoxModelFilterSetForm):
 
     fieldsets = (
         FieldSet("q", "tag", "filter_id", name="General"),
-        FieldSet("name", "status", "segment_type", "network_label", "has_path_data", name="Basic"),
+        FieldSet(
+            "name", "status", "segment_type", "network_label", "has_path_data", "has_type_specific_data", name="Basic"
+        ),
         FieldSet(
             "provider_id",
             "provider_segment_id",

cesnet_service_path_plugin/graphql/filters.py

@@ -6,6 +6,8 @@
 from strawberry_django import FilterLookup
 from django.db.models import Q
 
+import logging
+
 from netbox.graphql.filter_mixins import NetBoxModelFilterMixin
 
 if TYPE_CHECKING:
@@ -76,7 +78,6 @@ class SegmentFilter(NetBoxModelFilterMixin):
     @strawberry_django.filter_field
     def has_path_data(self, value: bool, prefix: str) -> Q:
         """Filter segments based on whether they have path geometry data"""
-
         if value:
             # Filter for segments WITH path data
             return Q(**{f"{prefix}path_geometry__isnull": False})

cesnet_service_path_plugin/templates/cesnet_service_path_plugin/segment_edit.html

@@ -2,7 +2,6 @@
 {% load i18n %}
 {% load static %}
 {% block title %}
-    TEST
     <link rel="stylesheet"
           href="{% static 'cesnet_service_path_plugin/css/segment_form.css' %}">
     <script src="{% static 'cesnet_service_path_plugin/js/segment_form.js' %}"></script>

cesnet_service_path_plugin/views/segment.py

@@ -159,9 +159,6 @@ def segment_map_view(request, pk):
     # if hasattr(segment, "status") and hasattr(segment, "get_status_display"):
     #    segment_style["color"] = status_colors.get(segment.get_status_display(), "#dc3545")
 
-    print("has path data:", segment.has_path_data())
-    print("has fallback line:", has_fallback_line)
-
     context = {
         "object": segment,
         "segment": segment,

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "cesnet_service_path_plugin"
-version = "5.1.0"
+version = "5.1.1"
 description = "Adds ability to create, edit and view service paths in the CESNET network."
 authors = [
     {name = "Jan Krupa", email = "[email protected]"},