From 04810ca500bac4f94c237e8503f59cd7e03ce2f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 12 Jan 2023 10:29:34 +0100
Subject: [PATCH] Move the admins user query GQL to the appropriate file

---
 webapp/graphql/User.js       | 24 ++++++++++++++++++++++++
 webapp/pages/admin/users.vue | 24 ++----------------------
 2 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/webapp/graphql/User.js b/webapp/graphql/User.js
index 1ed20f3e6..8c1b94591 100644
--- a/webapp/graphql/User.js
+++ b/webapp/graphql/User.js
@@ -62,6 +62,30 @@ export const minimisedUserQuery = () => {
   `
 }
 
+export const adminUserQuery = () => {
+  return gql`
+    query ($filter: _UserFilter, $first: Int, $offset: Int, $email: String) {
+      User(
+        email: $email
+        filter: $filter
+        first: $first
+        offset: $offset
+        orderBy: createdAt_desc
+      ) {
+        id
+        name
+        slug
+        email
+        role
+        createdAt
+        contributionsCount
+        commentedCount
+        shoutedCount
+      }
+    }
+  `
+}
+
 export const notificationQuery = (i18n) => {
   return gql`
     ${userFragment}
diff --git a/webapp/pages/admin/users.vue b/webapp/pages/admin/users.vue
index cbd7433ad..44f162c77 100644
--- a/webapp/pages/admin/users.vue
+++ b/webapp/pages/admin/users.vue
@@ -74,10 +74,10 @@
 
 <script>
 import { mapGetters } from 'vuex'
-import gql from 'graphql-tag'
 import { isEmail } from 'validator'
 import normalizeEmail from '~/components/utils/NormalizeEmail'
 import PaginationButtons from '~/components/_new/generic/PaginationButtons/PaginationButtons'
+import { adminUserQuery } from '~/graphql/User'
 import { FetchAllRoles, updateUserRole } from '~/graphql/admin/Roles'
 
 export default {
@@ -138,27 +138,7 @@ export default {
   apollo: {
     User: {
       query() {
-        return gql`
-          query ($filter: _UserFilter, $first: Int, $offset: Int, $email: String) {
-            User(
-              email: $email
-              filter: $filter
-              first: $first
-              offset: $offset
-              orderBy: createdAt_desc
-            ) {
-              id
-              name
-              slug
-              email
-              role
-              createdAt
-              contributionsCount
-              commentedCount
-              shoutedCount
-            }
-          }
-        `
+        return adminUserQuery()
       },
       variables() {
         const { offset, first, email, filter } = this