Merge branch 'revert-5c4c1daf' into 'release-3.0'

Revert "Merge branch '847-combine-polling-queries-to-one-polling-query' into 'release-3.0'"

See merge request !1235

CHANGELOG.rst

@@ -16,7 +16,6 @@ Added
 * Provide API endpoint for system status.
 * [Dev] UpdateIndicator Vue Component to display the status of interactive pages
 * [Dev] DeleteDialog Vue Component to unify item deletion in the new frontend
-* Use build-in mechanism in Apollo for GraphQL batch querying.
 
 
 Changed

aleksis/core/frontend/app/apollo.js

@@ -2,12 +2,11 @@
  * Configuration for Apollo provider, client, and caches.
  */
 
-import { ApolloClient, from } from "@/apollo-boost";
+import { ApolloClient, HttpLink, from } from "@/apollo-boost";
 
 import { RetryLink } from "@/apollo-link-retry";
 import { persistCache, LocalStorageWrapper } from "@/apollo3-cache-persist";
 import { InMemoryCache } from "@/apollo-cache-inmemory";
-import { BatchHttpLink } from "@/apollo-link-batch-http";
 
 // Cache for GraphQL query results in memory and persistent across sessions
 const cache = new InMemoryCache();
@@ -34,17 +33,14 @@ const links = [
   // Automatically retry failed queries
   new RetryLink(),
   // Finally, the HTTP link to the real backend (Django)
-  new BatchHttpLink({
+  new HttpLink({
     uri: getGraphqlURL(),
-    batchInterval: 200,
-    batchDebounce: true,
   }),
 ];
 
 /** Upstream Apollo GraphQL client */
 const apolloClient = new ApolloClient({
   cache,
-  shouldBatch: true,
   link: from(links),
 });
 

aleksis/core/settings.py

@@ -588,7 +588,6 @@ YARN_INSTALLED_APPS = [
     "@iconify/json@^2.1.30",
     "@mdi/font@^6.9.96",
     "apollo-boost@^0.4.9",
-    "apollo-link-batch-http@^1.2.14",
     "apollo-link-retry@^2.2.16",
     "apollo3-cache-persist@^0.14.1",
     "deepmerge@^4.2.2",

aleksis/core/urls.py

@@ -27,7 +27,7 @@ urlpatterns = [
     path("__icons__/", include("dj_iconify.urls")),
     path(
         "graphql/",
-        csrf_exempt(views.LoggingGraphQLView.as_view(batch=True)),
+        csrf_exempt(views.LoggingGraphQLView.as_view(graphiql=True)),
         name="graphql",
     ),
     path("logo", force_maintenance_mode_off(views.LogoView.as_view()), name="logo"),