Merge pull request #361 from nautobot/u/defiantearth/NAPPS-724/3.0-QA-review-fixes

Fixed issues found in QA review

Author: yanshcodilime

changes/361.fixed

@@ -0,0 +1 @@
+Restored missing action buttons on PolicyRule and NATPolicyRule tables and fixed an issue with the UserObject q filter.

nautobot_firewall_models/filters.py

@@ -125,9 +125,16 @@ class Meta:
         fields = [i.name for i in model._meta.get_fields() if not isinstance(i, GenericRelation)]
 
 
-class UserObjectFilterSet(BaseFilterSet, NautobotFilterSet):
+class UserObjectFilterSet(NautobotFilterSet):
     """Filter for UserObject."""
 
+    q = SearchFilter(
+        filter_predicates={
+            "name": "icontains",
+            "username": "icontains",
+        }
+    )
+
     class Meta:
         """Meta attributes for filter."""
 

nautobot_firewall_models/tables.py

@@ -198,6 +198,7 @@ class Meta(BaseTable.Meta):
             "request_id",
             "log",
             "status",
+            "actions",
         )
         default_columns = (
             "pk",
@@ -219,6 +220,7 @@ class Meta(BaseTable.Meta):
             "action",
             "log",
             "status",
+            "actions",
         )
 
 
@@ -277,6 +279,7 @@ class Meta(BaseTable.Meta):
             "description",
             "log",
             "status",
+            "actions",
         )
         default_columns = (
             # pylint: disable=duplicate-code
@@ -303,6 +306,7 @@ class Meta(BaseTable.Meta):
             "remark",
             "log",
             "status",
+            "actions",
         )
 
 

nautobot_firewall_models/tests/test_filters.py

@@ -9,6 +9,7 @@
 from nautobot.ipam.models import IPAddress, Namespace, Prefix
 
 from nautobot_firewall_models import filters, models
+from nautobot_firewall_models.models import UserObject
 
 from .fixtures import create_capirca_env
 
@@ -128,3 +129,41 @@ def setUpTestData(cls):
         application_object_groups[0].application_objects.set([application_objects[0]])
         application_object_groups[1].application_objects.set([application_objects[1]])
         application_object_groups[2].application_objects.set([application_objects[2]])
+
+
+class UserObjectTestCase(FilterTestCases.FilterTestCase):
+    """Test filtering operations for ApplicationObject Model."""
+
+    queryset = models.UserObject.objects.all()
+    filterset = filters.UserObjectFilterSet
+
+    @classmethod
+    def setUpTestData(cls):
+        """Set up test data."""
+
+        status_active = Status.objects.get(name="Active")
+        UserObject.objects.get_or_create(
+            username="user1",
+            name="Bob",
+            status=status_active,
+        )
+        UserObject.objects.get_or_create(
+            username="user2",
+            name="Fred",
+            status=status_active,
+        )
+        UserObject.objects.get_or_create(
+            username="user3",
+            name="Tom",
+            status=status_active,
+        )
+
+    def test_q_filter_name(self):
+        """Test q filter on name field"""
+        params = {"q": "Bob"}
+        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1)
+
+    def test_q_filter_username(self):
+        """Test q filter on username field"""
+        params = {"q": "user2"}
+        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1)