From a0d0ab1e78974808e697f14f624ace964bc3a8e9 Mon Sep 17 00:00:00 2001
From: Arthur <worldnomad@gmail.com>
Date: Thu, 15 Feb 2024 16:03:47 -0800
Subject: [PATCH] 9856 misc fixes

---
 base_requirements.txt        | 6 +++---
 netbox/dcim/graphql/types.py | 6 ++----
 requirements.txt             | 2 +-
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/base_requirements.txt b/base_requirements.txt
index e20a4a32b..f6132d435 100644
--- a/base_requirements.txt
+++ b/base_requirements.txt
@@ -131,9 +131,9 @@ social-auth-core
 # https://github.com/python-social-auth/social-app-django/blob/master/CHANGELOG.md
 social-auth-app-django
 
-# Enhanced Strawberry GraphQL integration with Django
-# https://github.com/blb-ventures/strawberry-django-plus/blob/main/CHANGELOG.md
-strawberry-graphql-django
+# Strawberry GraphQL Django extension
+# https://github.com/strawberry-graphql/strawberry-django/blob/main/CHANGELOG.md
+strawberry-django
 
 # SVG image rendering (used for rack elevations)
 # https://github.com/mozman/svgwrite/blob/master/NEWS.rst
diff --git a/netbox/dcim/graphql/types.py b/netbox/dcim/graphql/types.py
index 123e7deee..028d12091 100644
--- a/netbox/dcim/graphql/types.py
+++ b/netbox/dcim/graphql/types.py
@@ -118,7 +118,6 @@ class CableTerminationType(NetBoxObjectType):
         Annotated["PowerOutletType", strawberry.lazy('dcim.graphql.types')],
         Annotated["PowerPortType", strawberry.lazy('dcim.graphql.types')],
         Annotated["RearPortType", strawberry.lazy('dcim.graphql.types')],
-
     ], strawberry.union("CableTerminationTerminationType")]]:
         return self.termination
 
@@ -586,12 +585,11 @@ class SiteGroupType(VLANGroupsMixin, ContactsMixin, OrganizationalObjectType):
 
 @strawberry_django.type(
     models.VirtualChassis,
-    # fields='__all__',
-    exclude=('member_count',),  # bug - temp
+    fields='__all__',
     filters=VirtualChassisFilter
 )
 class VirtualChassisType(NetBoxObjectType):
-    pass
+    member_count: BigInt
 
 
 @strawberry_django.type(
diff --git a/requirements.txt b/requirements.txt
index d29fd5622..0d2933ac0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -30,7 +30,7 @@ PyYAML==6.0.1
 requests==2.31.0
 social-auth-app-django==5.4.0
 social-auth-core[openidconnect]==4.5.2
-strawberry-graphql-django==0.30.1
+strawberry-graphql-django==0.31.0
 svgwrite==1.4.3
 tablib==3.5.0
 tzdata==2023.4