From b4f47997b3f67b79a414d11c2102782dc81a7660 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Fri, 4 Oct 2019 10:40:18 +0200
Subject: [PATCH] Centralized and refactored report mutations and queries

---
 webapp/components/Modal/ReportModal.vue           | 10 ++--------
 .../{ModerationListQuery.js => Moderation.js}     | 15 +++++++++++++--
 webapp/pages/moderation/index.vue                 |  4 ++--
 3 files changed, 17 insertions(+), 12 deletions(-)
 rename webapp/graphql/{ModerationListQuery.js => Moderation.js} (81%)

diff --git a/webapp/components/Modal/ReportModal.vue b/webapp/components/Modal/ReportModal.vue
index a55c12f42..ff31d5e0e 100644
--- a/webapp/components/Modal/ReportModal.vue
+++ b/webapp/components/Modal/ReportModal.vue
@@ -68,8 +68,8 @@
 </template>
 
 <script>
-import gql from 'graphql-tag'
 import { SweetalertIcon } from 'vue-sweetalert-icons'
+import { reportMutation } from '~/graphql/Moderation.js'
 
 export default {
   name: 'ReportModal',
@@ -173,13 +173,7 @@ export default {
       // await this.modalData.buttons.confirm.callback()
       this.$apollo
         .mutate({
-          mutation: gql`
-            mutation($id: ID!, $reasonCategory: String!, $description: String!) {
-              report(id: $id, reasonCategory: $reasonCategory, description: $description) {
-                id
-              }
-            }
-          `,
+          mutation: reportMutation(),
           variables: {
             id: this.id,
             reasonCategory: reasonCategory.value,
diff --git a/webapp/graphql/ModerationListQuery.js b/webapp/graphql/Moderation.js
similarity index 81%
rename from webapp/graphql/ModerationListQuery.js
rename to webapp/graphql/Moderation.js
index 221ec6177..b6dd69da1 100644
--- a/webapp/graphql/ModerationListQuery.js
+++ b/webapp/graphql/Moderation.js
@@ -1,13 +1,14 @@
 import gql from 'graphql-tag'
 
-export default app => {
+export const reportListQuery = () => {
   return gql`
     query {
       Report(first: 20, orderBy: createdAt_desc) {
         id
+        createdAt
+        reasonCategory
         description
         type
-        createdAt
         submitter {
           id
           slug
@@ -79,3 +80,13 @@ export default app => {
     }
   `
 }
+
+export const reportMutation = () => {
+  return gql`
+    mutation($id: ID!, $reasonCategory: String!, $description: String!) {
+      report(id: $id, reasonCategory: $reasonCategory, description: $description) {
+        id
+      }
+    }
+  `
+}
diff --git a/webapp/pages/moderation/index.vue b/webapp/pages/moderation/index.vue
index 9988ebc7a..1f8bb65c9 100644
--- a/webapp/pages/moderation/index.vue
+++ b/webapp/pages/moderation/index.vue
@@ -110,7 +110,7 @@
 
 <script>
 import HcEmpty from '~/components/Empty.vue'
-import query from '~/graphql/ModerationListQuery.js'
+import { reportListQuery } from '~/graphql/Moderation.js'
 
 export default {
   components: {
@@ -134,7 +134,7 @@ export default {
   },
   apollo: {
     Report: {
-      query,
+      query: reportListQuery(),
       fetchPolicy: 'cache-and-network',
     },
   },