Fix missing contract tabs

DanSheps · DanSheps · commit f08c35c04413 · 2026-05-12T17:40:02.000-05:00
diff --git a/netbox_lifecycle/choices/__init__.py b/netbox_lifecycle/choices/__init__.py
@@ -0,0 +1,5 @@
+from .contract import ContractStatusChoices
+
+__all__ = (
+    'ContractStatusChoices',
+)
diff --git a/netbox_lifecycle/choices/contract.py b/netbox_lifecycle/choices/contract.py
@@ -0,0 +1,22 @@
+from django.utils.translation import gettext as _
+from utilities.choices import ChoiceSet
+
+from netbox_lifecycle import constants
+
+
+class ContractStatusChoices(ChoiceSet):
+    """
+    Support contract status choices.
+    """
+
+    ACTIVE = constants.CONTRACT_STATUS_ACTIVE
+    EXPIRED = constants.CONTRACT_STATUS_EXPIRED
+    FUTURE = constants.CONTRACT_STATUS_FUTURE
+    UNSPECIFIED = constants.CONTRACT_STATUS_UNSPECIFIED
+
+    CHOICES = (
+        (ACTIVE, _('Active')),
+        (FUTURE, _('Future')),
+        (UNSPECIFIED, _('Unspecified')),
+        (EXPIRED, _('Expired')),
+    )
diff --git a/netbox_lifecycle/filtersets/contract.py b/netbox_lifecycle/filtersets/contract.py
@@ -8,6 +8,8 @@
 from utilities.filtersets import register_filterset
 from virtualization.models import VirtualMachine
 
+from netbox_lifecycle import constants
+from netbox_lifecycle.choices import ContractStatusChoices
 from netbox_lifecycle.models import (
     License,
     SupportContract,
@@ -187,9 +189,10 @@ class SupportContractAssignmentFilterSet(NetBoxModelFilterSet):
         to_field_name='status',
         label=_('Device Status'),
     )
-    expired = django_filters.BooleanFilter(
-        method='filter_expired',
-        label=_('Expired'),
+    status = django_filters.ChoiceFilter(
+        choices=ContractStatusChoices.CHOICES,
+        method='filter_status',
+        label=_('Status'),
     )
 
     class Meta:
@@ -205,6 +208,7 @@ class Meta:
             'virtual_machine_id',
             'license_id',
             'device_status',
+            'status',
         )
 
     def search(self, queryset, name, value):
@@ -224,9 +228,16 @@ def search(self, queryset, name, value):
         )
         return queryset.filter(qs_filter).distinct()
 
-    def filter_expired(self, queryset, name, value):
+    def filter_status(self, queryset, name, value):
         today = timezone.now().date()
         expired = Q(end__lt=today) | Q(end__isnull=True, contract__end__lt=today)
-        if value:
+        future = Q(contract__start__gt=today)
+        if value == constants.CONTRACT_STATUS_ACTIVE:
+            return queryset.exclude(expired).exclude(future)
+        elif value == constants.CONTRACT_STATUS_FUTURE:
+            return queryset.filter(future)
+        elif value == constants.CONTRACT_STATUS_EXPIRED:
             return queryset.filter(expired)
-        return queryset.exclude(expired)
+        elif value == constants.CONTRACT_STATUS_UNSPECIFIED:
+            return queryset.filter(end__isnull=True, contract__end__isnull=True)
+        return queryset
diff --git a/netbox_lifecycle/template_content.py b/netbox_lifecycle/template_content.py
@@ -1,11 +1,15 @@
+import traceback
+
 from django.conf import settings
 from django.contrib.contenttypes.models import ContentType
 from django.utils.translation import gettext_lazy as _
 from netbox.plugins import PluginTemplateExtension
 from netbox.ui import panels, actions
 
-from .models import hardware
-from .ui import HardwareLifecyclePanel, HardwareLifecycleDatesPanel
+from netbox_lifecycle import constants
+from netbox_lifecycle.models import hardware
+from netbox_lifecycle.ui import HardwareLifecyclePanel, HardwareLifecycleDatesPanel
+from netbox_lifecycle.ui.panels.tabbed import TabbedTablePanel
 
 PLUGIN_SETTINGS = settings.PLUGINS_CONFIG.get('netbox_lifecycle', {})
 
@@ -58,8 +62,7 @@ def right_page(self):
         if hasattr(self, '_render_lifecycle_info'):
             result += self._render_lifecycle_info('right_page')
         if hasattr(self, '_render_contract_card'):
-            result += self._render_contract_card('right_page', expired=False)
-            result += self._render_contract_card('right_page', expired=True)
+            result += self._render_contract_card('right_page')
         if hasattr(self, '_render_license_card'):
             result += self._render_license_card('right_page')
         return result
@@ -69,8 +72,7 @@ def left_page(self):
         if hasattr(self, '_render_lifecycle_info'):
             result += self._render_lifecycle_info('left_page')
         if hasattr(self, '_render_contract_card'):
-            result += self._render_contract_card('left_page', expired=False)
-            result += self._render_contract_card('left_page', expired=True)
+            result += self._render_contract_card('left_page')
         if hasattr(self, '_render_license_card'):
             result += self._render_license_card('left_page')
         return result
@@ -80,8 +82,7 @@ def full_width_page(self):
         if hasattr(self, '_render_lifecycle_info'):
             result += self._render_lifecycle_info('full_width_page')
         if hasattr(self, '_render_contract_card'):
-            result += self._render_contract_card('full_width_page', expired=False)
-            result += self._render_contract_card('full_width_page', expired=True)
+            result += self._render_contract_card('full_width_page')
         if hasattr(self, '_render_license_card'):
             result += self._render_license_card('full_width_page')
         return result
@@ -122,56 +123,87 @@ class ContractMixin:
     def get_contract_card_position(self):
         return PLUGIN_SETTINGS.get('contract_card_position', 'right_page')
 
-    def _render_contract_card(self, location=None, expired=None):
+    def _render_contract_card(self, location=None):
         if self.get_contract_card_position() != location:
             return ''
 
         title = _('Contracts')
-        filter = {}
-        action = []
-        if expired is True or expired is False:
-            filter = {'expired': expired}
-            title = _('Expired Contracts') if expired else _('Active Contracts')
-
-        if not expired:
-            action = [
-                actions.AddObject(
-                    'netbox_lifecycle.SupportContractAssignment',
-                    url_params={
-                        self.model_name: lambda ctx: ctx['object'].pk,
-                    },
-                ),
-            ]
+        action = [
+            actions.AddObject(
+                'netbox_lifecycle.SupportContractAssignment',
+                url_params={
+                    self.model_name: lambda ctx: ctx['object'].pk,
+                },
+            ),
+        ]
 
+        include_columns = [
+            'contract',
+            'sku',
+        ]
+        exclude_columns = [
+            'device_name',
+            'module_name',
+            'virtual_machine_name',
+            'license_name',
+            'device_model',
+            'device_serial',
+            'module_serial',
+            'device_status',
+            'virtual_machine_status',
+            'quantity',
+            'renewal',
+            'end',
+            'description',
+            'comments',
+            'actions',
+        ]
+        filter = {
+            self.field_name: lambda ctx: ctx['object'].pk,
+        }
         context = self.get_context(self.context)
-        panel = panels.ObjectsTablePanel(
-            title=title,
-            model='netbox_lifecycle.supportcontractassignment',
-            filters={self.field_name: lambda ctx: ctx['object'].pk, **filter},
-            include_columns=[
-                'contract',
-                'sku',
-            ],
-            exclude_columns=[
-                'device_name',
-                'module_name',
-                'virtual_machine_name',
-                'license_name',
-                'device_model',
-                'device_serial',
-                'module_serial',
-                'device_status',
-                'virtual_machine_status',
-                'quantity',
-                'renewal',
-                'end',
-                'description',
-                'comments',
-                'actions',
-            ],
-            actions=action,
-        )
-        return panel.render(context=context)
+        try:
+            panel = TabbedTablePanel(
+                title=title,
+                tabs={
+                    'active': panels.ObjectsTablePanel(
+                        title=_('Active'),
+                        model='netbox_lifecycle.supportcontractassignment',
+                        filters={**filter, 'status': constants.CONTRACT_STATUS_ACTIVE},
+                        include_columns=include_columns,
+                        exclude_columns=exclude_columns,
+                    ),
+                    'expired': panels.ObjectsTablePanel(
+                        title=_('Expired'),
+                        model='netbox_lifecycle.supportcontractassignment',
+                        filters={**filter, 'status': constants.CONTRACT_STATUS_EXPIRED},
+                        include_columns=include_columns,
+                        exclude_columns=exclude_columns,
+                    ),
+                    'future': panels.ObjectsTablePanel(
+                        title=_('Future'),
+                        model='netbox_lifecycle.supportcontractassignment',
+                        filters={**filter, 'status': constants.CONTRACT_STATUS_FUTURE},
+                        include_columns=include_columns,
+                        exclude_columns=exclude_columns,
+                    ),
+                    'unspecified': panels.ObjectsTablePanel(
+                        title=_('Unspecified'),
+                        model='netbox_lifecycle.supportcontractassignment',
+                        filters={
+                            **filter,
+                            'status': constants.CONTRACT_STATUS_UNSPECIFIED,
+                        },
+                        include_columns=include_columns,
+                        exclude_columns=exclude_columns,
+                    ),
+                },
+                actions=action,
+            )
+            return panel.render(context=context)
+        except Exception as e:
+            traceback.print_exception(type(e), e, e.__traceback__)
+            # traceback.print_exception(e)
 
 
 class LicenseMixin:
@@ -198,7 +230,8 @@ def _render_license_card(self, location=None, exclude=None, include=None):
             model='netbox_lifecycle.licenseassignment',
             filters={self.field_name: lambda ctx: ctx['object'].pk},
             include_columns=[
-                'vendor', 'license',
+                'vendor',
+                'license',
                 'quantity',
             ],
             exclude_columns=[
@@ -235,7 +268,9 @@ class ModuleTypeLifecycleContent(LifecycleMixin, BaseMixin, PluginTemplateExtens
     models = ['dcim.moduletype']
 
 
-class VirtualMachineContractContent(ContractMixin, LicenseMixin, BaseMixin, PluginTemplateExtension):
+class VirtualMachineContractContent(
+    ContractMixin, LicenseMixin, BaseMixin, PluginTemplateExtension
+):
     """Template extension for VirtualMachine detail pages showing contracts and licenses."""
 
     models = ['virtualization.virtualmachine']
diff --git a/netbox_lifecycle/templates/netbox_lifecycle/ui/panels/tabbed_table.html b/netbox_lifecycle/templates/netbox_lifecycle/ui/panels/tabbed_table.html
@@ -0,0 +1,39 @@
+{% extends "ui/panels/_base.html" %}
+{% load i18n %}
+
+{% block panel_content %}
+    <ul class="nav nav-tabs" role="tablist">
+        {% for tab in tabs %}
+            <li class="nav-item" role="presentation">
+                {% if tab.active %}
+                    <a href="#tab-{{ tab.name }}" class="nav-link active" data-bs-toggle="tab" role="tab"
+                       hx-get="{% url tab.viewname %}?embedded=True{% if tab.url_params %}&{{ tab.url_params.urlencode }}{% endif %}"
+                       hx-trigger="load" hx-target="#tab-{{ tab.name }}" hx-select=".htmx-container"
+                       hx-swap="innerHTML">
+                        {% trans tab.title %}
+                    </a>
+                {% else %}
+                    <a href="#tab-{{ tab.name }}" class="nav-link" data-bs-toggle="tab" role="tab"
+                       hx-get="{% url tab.viewname %}?embedded=True{% if tab.url_params %}&{{ tab.url_params.urlencode }}{% endif %}"
+                       hx-trigger="click once" hx-target="#tab-{{ tab.name }}" hx-select=".htmx-container"
+                       hx-swap="innerHTML">
+                        {% trans tab.title %}
+                    </a>
+                {% endif %}
+            </li>
+        {% endfor %}
+    </ul>
+    <div class="tab-content">
+        {% for tab in tabs %}
+            {% if tab.active %}
+                <div class="tab-pane fade show active" id="tab-{{ tab.name }}" role="tabpanel">
+                    <div class="htmx-container table-responsive"></div>
+                </div>
+            {% else %}
+                <div class="tab-pane" id="tab-{{ tab.name }}" role="tabpanel">
+                    <div class="htmx-container table-responsive"></div>
+                </div>
+            {% endif %}
+        {% endfor %}
+    </div>
+{% endblock panel_content %}
diff --git a/netbox_lifecycle/ui/panels/tabbed.py b/netbox_lifecycle/ui/panels/tabbed.py
@@ -0,0 +1,54 @@
+from netbox.ui.panels import Panel, ObjectsTablePanel
+from utilities.querydict import dict_to_querydict
+from utilities.string import title
+from utilities.views import get_viewname
+
+
+class TabbedTablePanel(Panel):
+    """
+    A panel which displays panels within tabs.
+    """
+
+    template_name = 'netbox_lifecycle/ui/panels/tabbed_table.html'
+
+    def __init__(self, tabs: dict, **kwargs):
+        super().__init__(**kwargs)
+        for tab in tabs.values():
+            if tab is ObjectsTablePanel:
+                raise TypeError(
+                    f"TabbedTablePanel only accepts ObjectsTablePanel instances, got {type(tab)}"
+                )
+        self.tabs = tabs
+
+    def get_context(self, context):
+        tabs = []
+        first = True
+        for name, panel in self.tabs.items():
+            # If no title is specified, derive one from the model name
+            url_params = {
+                k: v(context) if callable(v) else v for k, v in panel.filters.items()
+            }
+
+            if 'return_url' not in url_params and 'object' in context:
+                url_params['return_url'] = context['object'].get_absolute_url()
+            if panel.include_columns:
+                url_params['include_columns'] = ','.join(panel.include_columns)
+            if panel.exclude_columns:
+                url_params['exclude_columns'] = ','.join(panel.exclude_columns)
+
+            tab = {
+                'name': name,
+                'model': panel.model,
+                'viewname': get_viewname(panel.model, 'list'),
+                'title': panel.title or title(panel.model._meta.verbose_name_plural),
+                'active': True if first else False,
+                'url_params': dict_to_querydict(url_params),
+            }
+            first = False
+            tabs.append(tab)
+
+        return {
+            **super().get_context(context),
+            'title': self.title,
+            'tabs': tabs,
+        }
