Fixes #17895: Ensure GraphiQL UI resources are served locally

netbox-community · Nov 1, 2024 · 81f00fd · 81f00fd
1 parent 58bc388
commit 81f00fd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 13 deletions.
diff --git a/netbox/netbox/graphql/views.py b/netbox/netbox/graphql/views.py
@@ -14,7 +14,6 @@ class NetBoxGraphQLView(GraphQLView):
     """
     Extends strawberry's GraphQLView to support DRF's token-based authentication.
     """
-    graphiql_template = 'graphiql.html'
 
     @csrf_exempt
     def dispatch(self, request, *args, **kwargs):

diff --git a/netbox/templates/graphiql.html → netbox/templates/graphql/graphiql.html b/netbox/templates/graphiql.html → netbox/templates/graphql/graphiql.html
@@ -1,15 +1,8 @@
+{% load static %}
 {% comment %}
   This template derives from the strawberry-graphql project:
   https://github.com/strawberry-graphql/strawberry/blob/main/strawberry/static/graphiql.html
 {% endcomment %}
-<!--
-The request to this GraphQL server provided the header "Accept: text/html"
-and as a result has been presented GraphiQL - an in-browser IDE for
-exploring GraphQL.
-If you wish to receive JSON, provide the header "Accept: application/json" or
-add "&raw" to the end of the URL within a browser.
--->
-{% load static %}
 <!DOCTYPE html>
 <html>
   <head>
@@ -112,10 +105,7 @@
         headers["x-csrftoken"] = csrfToken;
       }
 
-      const subscriptionsEnabled = JSON.parse("{{ SUBSCRIPTION_ENABLED }}");
-      const subscriptionUrl = subscriptionsEnabled
-        ? httpUrlToWebSockeUrl(fetchURL)
-        : null;
+      const subscriptionUrl = httpUrlToWebSockeUrl(fetchURL);
 
       const fetcher = GraphiQL.createFetcher({
         url: fetchURL,