9856 compatability fixes

netbox/circuits/graphql/filters.py

@@ -1,4 +1,5 @@
 import strawberry
+import strawberry_django
 from strawberry import auto
 from circuits import models, filtersets
 
@@ -12,7 +13,7 @@ __all__ = (
 )
 
 
-@strawberry.django.filter(models.CircuitTermination, lookups=True)
+@strawberry_django.filter(models.CircuitTermination, lookups=True)
 class CircuitTerminationFilter(filtersets.CircuitTerminationFilterSet):
     id: auto
     term_side: auto
@@ -28,7 +29,7 @@ class CircuitTerminationFilter(filtersets.CircuitTerminationFilterSet):
     # provider_network_id: auto
 
 
-@strawberry.django.filter(models.Circuit, lookups=True)
+@strawberry_django.filter(models.Circuit, lookups=True)
 class CircuitFilter(filtersets.CircuitFilterSet):
     id: auto
     cid: auto
@@ -39,19 +40,34 @@ class CircuitFilter(filtersets.CircuitFilterSet):
     provider_id: auto
     provider: auto
     provider_account_id: auto
-    # provider_network_id: auto
     type_id: auto
-    type: auto
     status: auto
-    # region_id: auto
-    # region: auto
-    # site_group_id: auto
-    # site_group: auto
-    # site_id: auto
-    # site: auto
 
 
-@strawberry.django.filter(models.CircuitType, lookups=True)
+# @strawberry_django.filter(models.Circuit, lookups=True)
+# class CircuitFilter(filtersets.CircuitFilterSet):
+#     id: auto
+#     cid: auto
+#     description: auto
+#     install_date: auto
+#     termination_date: auto
+#     commit_rate: auto
+#     provider_id: auto
+#     provider: auto
+#     provider_account_id: auto
+#     # provider_network_id: auto
+#     type_id: auto
+#     type: auto
+#     status: auto
+#     # region_id: auto
+#     # region: auto
+#     # site_group_id: auto
+#     # site_group: auto
+#     # site_id: auto
+#     # site: auto
+
+
+@strawberry_django.filter(models.CircuitType, lookups=True)
 class CircuitTypeFilter(filtersets.CircuitTypeFilterSet):
     id: auto
     name: auto
@@ -59,7 +75,7 @@ class CircuitTypeFilter(filtersets.CircuitTypeFilterSet):
     description: auto
 
 
-@strawberry.django.filter(models.Provider, lookups=True)
+@strawberry_django.filter(models.Provider, lookups=True)
 class ProviderFilter(filtersets.ProviderFilterSet):
     id: auto
     name: auto
@@ -73,7 +89,7 @@ class ProviderFilter(filtersets.ProviderFilterSet):
     # asn_id: auto
 
 
-@strawberry.django.filter(models.ProviderAccount, lookups=True)
+@strawberry_django.filter(models.ProviderAccount, lookups=True)
 class ProviderAccountFilter(filtersets.ProviderAccountFilterSet):
     id: auto
     name: auto
@@ -83,7 +99,7 @@ class ProviderAccountFilter(filtersets.ProviderAccountFilterSet):
     # provider: auto
 
 
-@strawberry.django.filter(models.ProviderNetwork, lookups=True)
+@strawberry_django.filter(models.ProviderNetwork, lookups=True)
 class ProviderNetworkFilter(filtersets.ProviderNetworkFilterSet):
     id: auto
     name: auto

netbox/circuits/graphql/schema.py

@@ -1,5 +1,6 @@
 from typing import List
 import strawberry
+import strawberry_django
 
 from circuits import models
 from .types import *
@@ -7,20 +8,20 @@ from .types import *
 
 @strawberry.type
 class CircuitsQuery:
-    circuit: CircuitType = strawberry.django.field()
-    circuit_list: List[CircuitType] = strawberry.django.field()
+    circuit: CircuitType = strawberry_django.field()
+    circuit_list: List[CircuitType] = strawberry_django.field()
 
-    circuit_termination: CircuitTerminationType = strawberry.django.field()
-    circuit_termination_list: List[CircuitTerminationType] = strawberry.django.field()
+    circuit_termination: CircuitTerminationType = strawberry_django.field()
+    circuit_termination_list: List[CircuitTerminationType] = strawberry_django.field()
 
-    circuit_type: CircuitTypeType = strawberry.django.field()
-    circuit_type_list: List[CircuitTypeType] = strawberry.django.field()
+    circuit_type: CircuitTypeType = strawberry_django.field()
+    circuit_type_list: List[CircuitTypeType] = strawberry_django.field()
 
-    provider: ProviderType = strawberry.django.field()
-    provider_list: List[ProviderType] = strawberry.django.field()
+    provider: ProviderType = strawberry_django.field()
+    provider_list: List[ProviderType] = strawberry_django.field()
 
-    provider_account: ProviderAccountType = strawberry.django.field()
-    provider_account_list: List[ProviderAccountType] = strawberry.django.field()
+    provider_account: ProviderAccountType = strawberry_django.field()
+    provider_account_list: List[ProviderAccountType] = strawberry_django.field()
 
-    provider_network: ProviderNetworkType = strawberry.django.field()
-    provider_network_list: List[ProviderNetworkType] = strawberry.django.field()
+    provider_network: ProviderNetworkType = strawberry_django.field()
+    provider_network_list: List[ProviderNetworkType] = strawberry_django.field()

netbox/netbox/graphql/types.py

@@ -29,7 +29,7 @@ class BaseObjectType:
     """
 
     @classmethod
-    def get_queryset(cls, queryset, info):
+    def get_queryset(cls, queryset, info, **kwargs):
         # Enforce object permissions on the queryset
         return queryset.restrict(info.context.request.user, 'view')
 

netbox/users/graphql/schema.py

@@ -1,5 +1,6 @@
 from typing import List
 import strawberry
+import strawberry_django
 
 from django.contrib.auth import get_user_model
 from django.contrib.auth.models import Group
@@ -8,8 +9,8 @@ from .types import *
 
 @strawberry.type
 class UsersQuery:
-    group: GroupType = strawberry.django.field()
-    group_list: List[GroupType] = strawberry.django.field()
+    group: GroupType = strawberry_django.field()
+    group_list: List[GroupType] = strawberry_django.field()
 
-    user: UserType = strawberry.django.field()
-    user_list: List[UserType] = strawberry.django.field()
+    user: UserType = strawberry_django.field()
+    user_list: List[UserType] = strawberry_django.field()