From 965882885a9662357b41fc7359ec78c589814a96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Fri, 18 Oct 2019 15:41:18 +0200
Subject: [PATCH 001/174] Refactor moderators report list

---
 webapp/components/User/User.vue   | 27 +++++++++++----
 webapp/graphql/Moderation.js      | 12 +++++++
 webapp/locales/de.json            |  2 +-
 webapp/locales/en.json            |  2 +-
 webapp/pages/moderation/index.vue | 56 ++++++++++++++++++++-----------
 5 files changed, 71 insertions(+), 28 deletions(-)

diff --git a/webapp/components/User/User.vue b/webapp/components/User/User.vue
index 3afef5c11..4b92ee890 100644
--- a/webapp/components/User/User.vue
+++ b/webapp/components/User/User.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="user" v-if="displayAnonymous">
-    <hc-avatar class="avatar" />
+    <hc-avatar v-if="showAvatar" class="avatar" />
     <div>
       <b class="username">{{ $t('profile.userAnonym') }}</b>
     </div>
@@ -9,11 +9,12 @@
     <template slot="default" slot-scope="{ openMenu, closeMenu, isOpen }">
       <nuxt-link :to="userLink" :class="['user', isOpen && 'active']">
         <div @mouseover="openMenu(true)" @mouseleave="closeMenu(true)">
-          <hc-avatar class="avatar" :user="user" />
+          <hc-avatar v-if="showAvatar" class="avatar" :user="user" />
           <div>
             <ds-text>
-              <b class="username">{{ userName | truncate(18) }}</b>
-              <ds-text v-if="dateTime" size="small" color="soft">
+              <b class="username">{{ userName | truncate(trunc) }}</b>
+              <!-- dateTime: kind of same as underneath: make own component? -->
+              <ds-text v-if="positionDatetime === 'sideward' && dateTime" size="small" color="soft">
                 <ds-icon name="clock" />
                 <client-only>
                   <hc-relative-date-time :date-time="dateTime" />
@@ -22,9 +23,17 @@
               </ds-text>
             </ds-text>
           </div>
-          <ds-text align="left" size="small" color="soft">
+          <ds-text class="user-slug" align="left" size="small" color="soft">
             {{ userSlug }}
           </ds-text>
+          <!-- dateTime: kind of same as above: make own component? -->
+          <ds-text v-if="positionDatetime === 'below' && dateTime" size="small" color="soft">
+            <ds-icon name="clock" />
+            <client-only>
+              <hc-relative-date-time :date-time="dateTime" />
+            </client-only>
+            <slot name="dateTime"></slot>
+          </ds-text>
         </div>
       </nuxt-link>
     </template>
@@ -110,8 +119,10 @@ export default {
   },
   props: {
     user: { type: Object, default: null },
-    trunc: { type: Number, default: null },
+    showAvatar: { type: Boolean, default: true },
+    trunc: { type: Number, default: 18 }, // "-1" is no trunc
     dateTime: { type: [Date, String], default: null },
+    positionDatetime: { type: String, default: 'sideward' }, // 'below' is the otherone
   },
   computed: {
     ...mapGetters({
@@ -172,4 +183,8 @@ export default {
     z-index: 999;
   }
 }
+
+.user-slug {
+  margin-bottom: $space-xx-small;
+}
 </style>
diff --git a/webapp/graphql/Moderation.js b/webapp/graphql/Moderation.js
index 1a5bdb367..04ac11076 100644
--- a/webapp/graphql/Moderation.js
+++ b/webapp/graphql/Moderation.js
@@ -15,6 +15,9 @@ export const reportListQuery = () => {
           name
           disabled
           deleted
+          followedByCount
+          contributionsCount
+          commentedCount
         }
         user {
           id
@@ -29,6 +32,9 @@ export const reportListQuery = () => {
             disabled
             deleted
           }
+          followedByCount
+          contributionsCount
+          commentedCount
         }
         comment {
           id
@@ -39,6 +45,9 @@ export const reportListQuery = () => {
             name
             disabled
             deleted
+            followedByCount
+            contributionsCount
+            commentedCount
           }
           post {
             id
@@ -67,6 +76,9 @@ export const reportListQuery = () => {
             name
             disabled
             deleted
+            followedByCount
+            contributionsCount
+            commentedCount
           }
           disabledBy {
             id
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 9f10d929d..188f9e67d 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -435,7 +435,7 @@
       "reasonCategory": "Kategorie",
       "reasonDescription": "Beschreibung",
       "createdAt": "Datum",
-      "submitter": "Gemeldet von",
+      "submitter": "Gemeldet von / am",
       "disabledBy": "Deaktiviert von"
     }
   },
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 9860aa457..d2927ee38 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -436,7 +436,7 @@
       "reasonCategory": "Category",
       "reasonDescription": "Description",
       "createdAt": "Date",
-      "submitter": "Reported by",
+      "submitter": "Reported by / at",
       "disabledBy": "Disabled by"
     }
   },
diff --git a/webapp/pages/moderation/index.vue b/webapp/pages/moderation/index.vue
index ab72c0588..3149e2e98 100644
--- a/webapp/pages/moderation/index.vue
+++ b/webapp/pages/moderation/index.vue
@@ -33,8 +33,19 @@
           >
             <b>{{ scope.row.post.title | truncate(50) }}</b>
           </nuxt-link>
-          <br />
-          <ds-text size="small" color="soft">{{ scope.row.post.author.name }}</ds-text>
+          <!-- author: Same as author of comment underneath. Maybe dry the code … -->
+          <ds-space margin="x-small" />
+          <ds-flex>
+            <ds-flex-item width="20px">
+              <ds-icon
+                v-tooltip="{ content: $t('report.user.type'), placement: 'right' }"
+                name="user"
+              />
+            </ds-flex-item>
+            <ds-flex-item>
+              <hc-user :user="scope.row.post.author" :showAvatar="false" :trunc="25" />
+            </ds-flex-item>
+          </ds-flex>
         </div>
         <div v-else-if="scope.row.type === 'Comment'">
           <nuxt-link
@@ -49,18 +60,22 @@
           >
             <b>{{ scope.row.comment.contentExcerpt | removeHtml | truncate(50) }}</b>
           </nuxt-link>
-          <br />
-          <ds-text size="small" color="soft">{{ scope.row.comment.author.name }}</ds-text>
+          <!-- author: Same as author of post above. Maybe dry the code … -->
+          <ds-space margin="x-small" />
+          <ds-flex>
+            <ds-flex-item width="20px">
+              <ds-icon
+                v-tooltip="{ content: $t('report.user.type'), placement: 'right' }"
+                name="user"
+              />
+            </ds-flex-item>
+            <ds-flex-item>
+              <hc-user :user="scope.row.comment.author" :showAvatar="false" :trunc="25" />
+            </ds-flex-item>
+          </ds-flex>
         </div>
         <div v-else>
-          <nuxt-link
-            :to="{
-              name: 'profile-id-slug',
-              params: { id: scope.row.user.id, slug: scope.row.user.slug },
-            }"
-          >
-            <b>{{ scope.row.user.name | truncate(50) }}</b>
-          </nuxt-link>
+          <hc-user :user="scope.row.user" :showAvatar="false" :trunc="30" />
         </div>
       </template>
       <!-- reasonCategory -->
@@ -73,14 +88,13 @@
       </template>
       <!-- submitter -->
       <template slot="submitter" slot-scope="scope">
-        <nuxt-link
-          :to="{
-            name: 'profile-id-slug',
-            params: { id: scope.row.submitter.id, slug: scope.row.submitter.slug },
-          }"
-        >
-          {{ scope.row.submitter.name }}
-        </nuxt-link>
+        <hc-user
+          :user="scope.row.submitter"
+          :showAvatar="false"
+          :trunc="30"
+          :date-time="scope.row.createdAt"
+          :positionDatetime="'below'"
+        />
       </template>
       <!-- createdAt -->
       <template slot="createdAt" slot-scope="scope">
@@ -132,11 +146,13 @@
 <script>
 import HcEmpty from '~/components/Empty.vue'
 import HcRelativeDateTime from '~/components/RelativeDateTime'
+import HcUser from '~/components/User/User'
 import { reportListQuery } from '~/graphql/Moderation.js'
 
 export default {
   components: {
     HcEmpty,
+    HcUser,
     HcRelativeDateTime,
   },
   data() {

From 11341b82e67f701b70e776270c5def81fbbe879f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Wed, 23 Oct 2019 10:21:46 +0200
Subject: [PATCH 002/174] Structure reports in moderators list by content, just
 a beginning

---
 backend/src/seed/seed-db.js       |  28 +++++++
 webapp/locales/de.json            |   1 +
 webapp/locales/en.json            |   1 +
 webapp/pages/moderation/index.vue | 124 ++++++++++++++++++++++++++++++
 4 files changed, 154 insertions(+)

diff --git a/backend/src/seed/seed-db.js b/backend/src/seed/seed-db.js
index 76fbb4875..225ffa834 100644
--- a/backend/src/seed/seed-db.js
+++ b/backend/src/seed/seed-db.js
@@ -686,6 +686,34 @@ import { gql } from '../jest/helpers'
         },
       }),
     ])
+    // report content a second time
+    authenticatedUser = await dewey.toJson()
+    await Promise.all([
+      mutate({
+        mutation: reportMutation,
+        variables: {
+          resourceId: 'c1',
+          reasonCategory: 'other',
+          reasonDescription: 'This comment is bigoted',
+        },
+      }),
+      mutate({
+        mutation: reportMutation,
+        variables: {
+          resourceId: 'p1',
+          reasonCategory: 'discrimination_etc',
+          reasonDescription: 'This post is bigoted',
+        },
+      }),
+      mutate({
+        mutation: reportMutation,
+        variables: {
+          resourceId: 'u1',
+          reasonCategory: 'doxing',
+          reasonDescription: 'This user is harassing me with bigoted remarks',
+        },
+      }),
+    ])
     authenticatedUser = null
 
     await Promise.all(
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 53de815a6..9c7cde641 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -511,6 +511,7 @@
       "message": "Bist du sicher, dass du den Kommentar von \"<b>{name}</b>\" melden möchtest?",
       "error": "Du hast den Kommentar bereits gemeldet!"
     },
+    "author": "Verfasser",
     "reason": {
       "category": {
         "label": "Wähle eine Kategorie:",
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 0e9f123d1..9a5b0e634 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -512,6 +512,7 @@
       "message": "Do you really want to report the comment from \"<b>{name}</b>\"?",
       "error": "You have already reported the comment!"
     },
+    "author": "Author",
     "reason": {
       "category": {
         "label": "Select a category:",
diff --git a/webapp/pages/moderation/index.vue b/webapp/pages/moderation/index.vue
index 3149e2e98..835397d36 100644
--- a/webapp/pages/moderation/index.vue
+++ b/webapp/pages/moderation/index.vue
@@ -1,6 +1,88 @@
 <template>
   <ds-card space="small">
     <ds-heading tag="h3">{{ $t('moderation.reports.name') }}</ds-heading>
+    <ds-table
+      v-if="reports && reports.length"
+      :data="reportedContentStructure"
+      :fields="contentFields"
+      condensed
+    >
+      <!-- Icon -->
+      <template slot="type" slot-scope="scope">
+        <ds-text color="soft">
+          <ds-icon
+            v-if="scope.row.type === 'Post'"
+            v-tooltip="{ content: $t('report.contribution.type'), placement: 'right' }"
+            name="bookmark"
+          />
+          <ds-icon
+            v-else-if="scope.row.type === 'Comment'"
+            v-tooltip="{ content: $t('report.comment.type'), placement: 'right' }"
+            name="comments"
+          />
+          <ds-icon
+            v-else-if="scope.row.type === 'User'"
+            v-tooltip="{ content: $t('report.user.type'), placement: 'right' }"
+            name="user"
+          />
+        </ds-text>
+      </template>
+      <!-- reported user or content -->
+      <template slot="reportedUserContent" slot-scope="scope">
+        <div v-if="scope.row.type === 'Post' || scope.row.type === 'Comment'">
+          <nuxt-link
+            :to="{
+              name: 'post-id-slug',
+              params: {
+                id: scope.row.type === 'Post' ? scope.row.post.id : scope.row.comment.post.id,
+                slug: scope.row.type === 'Post' ? scope.row.post.slug : scope.row.comment.post.slug,
+              },
+              hash: scope.row.type === 'Comment' ? `#commentId-${scope.row.comment.id}` : undefined,
+            }"
+          >
+            <b v-if="scope.row.type === 'Post'">{{ scope.row.post.title | truncate(100) }}</b>
+            <b v-else>{{ scope.row.comment.contentExcerpt | removeHtml | truncate(100) }}</b>
+          </nuxt-link>
+          <ds-space margin="x-small" />
+          <ds-flex>
+            <ds-flex-item width="20px">
+              <ds-icon
+                v-tooltip="{ content: $t('report.author'), placement: 'right' }"
+                name="user"
+              />
+            </ds-flex-item>
+            <ds-flex-item>
+              <hc-user
+                v-if="scope.row.contentBelongsToUser"
+                :user="scope.row.contentBelongsToUser"
+                :showAvatar="false"
+                :trunc="25"
+              />
+            </ds-flex-item>
+          </ds-flex>
+        </div>
+        <div v-else>
+          <hc-user :user="scope.row.user" :showAvatar="false" :trunc="30" />
+        </div>
+      </template>
+      <!-- disabledBy -->
+      <template slot="disabledBy" slot-scope="scope">
+        <nuxt-link
+          v-if="scope.row.resource.disabledBy"
+          :to="{
+            name: 'profile-id-slug',
+            params: {
+              id: scope.row.resource.disabledBy.id,
+              slug: scope.row.resource.disabledBy.slug,
+            },
+          }"
+        >
+          <b>{{ scope.row.resource.disabledBy.name | truncate(50) }}</b>
+        </nuxt-link>
+        <b v-else>—</b>
+      </template>
+    </ds-table>
+    <hc-empty v-else icon="alert" :message="$t('moderation.reports.empty')" />
     <ds-table v-if="reports && reports.length" :data="reports" :fields="fields" condensed>
       <!-- Icon -->
       <template slot="type" slot-scope="scope">
@@ -158,9 +240,17 @@ export default {
   data() {
     return {
       reports: [],
+      reportedContentStructure: [],
     }
   },
   computed: {
+    contentFields() {
+      return {
+        type: ' ',
+        reportedUserContent: ' ',
+        disabledBy: this.$t('moderation.reports.disabledBy'),
+      }
+    },
     fields() {
       return {
         type: ' ',
@@ -174,6 +264,40 @@ export default {
       }
     },
   },
+  watch: {
+    reports: {
+      immediate: true,
+      handler(newReports) {
+        const newReportedContentStructure = []
+        newReports.forEach(report => {
+          const resource =
+            report.type === 'User'
+              ? report.user
+              : report.type === 'Post'
+              ? report.post
+              : report.type === 'Comment'
+              ? report.comment
+              : undefined
+          let idx = newReportedContentStructure.findIndex(content => content.resource.id === resource.id)
+          // if content not in content list, then push
+          if (idx === -1) {
+            idx = newReportedContentStructure.length
+            newReportedContentStructure.push({
+              type: report.type,
+              resource,
+              user: report.user,
+              post: report.post,
+              comment: report.comment,
+              contentBelongsToUser: report.type === 'User' ? null : resource.author,
+              reports: [],
+            })
+          }
+          newReportedContentStructure[idx].reports.push(report)
+        })
+        this.reportedContentStructure = newReportedContentStructure
+      },
+    },
+  },
   apollo: {
     reports: {
       query: reportListQuery(),

From 460d02657a58f0017972696f500d948fe237a273 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Wed, 23 Oct 2019 12:50:28 +0200
Subject: [PATCH 003/174] Try `ds-table` in `ds-table`, but is not really
 working

---
 webapp/pages/moderation/index.vue | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/webapp/pages/moderation/index.vue b/webapp/pages/moderation/index.vue
index 835397d36..18aa8475c 100644
--- a/webapp/pages/moderation/index.vue
+++ b/webapp/pages/moderation/index.vue
@@ -81,6 +81,24 @@
         </nuxt-link>
         <b v-else>—</b>
       </template>
+      <!-- <template slot="reports" slot-scope="scope">
+        <ds-table
+          :data="scope.row.submitter"
+          :fields="reportFields"
+          condensed
+        > -->
+          <!-- submitter -->
+          <!-- <template slot="submitter" slot-scope="scope">
+            <hc-user
+              :user="scope.row.submitter"
+              :showAvatar="false"
+              :trunc="30"
+              :date-time="scope.row.createdAt"
+              :positionDatetime="'below'"
+            />
+          </template>
+        </ds-table>
+      </template> -->
     </ds-table>
     <hc-empty v-else icon="alert" :message="$t('moderation.reports.empty')" />
     <ds-table v-if="reports && reports.length" :data="reports" :fields="fields" condensed>
@@ -251,6 +269,11 @@ export default {
         disabledBy: this.$t('moderation.reports.disabledBy'),
       }
     },
+    reportFields() {
+      return {
+        id: 'ID',
+      }
+    },
     fields() {
       return {
         type: ' ',

From 15d28aa8ef84788aa640aac67838380bfacf63b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Wed, 23 Oct 2019 15:59:34 +0200
Subject: [PATCH 004/174] Finish redesign of moderators report list

- It is not perfect, but will do it for now.
---
 backend/src/seed/seed-db.js       |  12 +-
 webapp/locales/de.json            |   6 +-
 webapp/locales/en.json            |   6 +-
 webapp/pages/moderation/index.vue | 371 +++++++++++-------------------
 4 files changed, 145 insertions(+), 250 deletions(-)

diff --git a/backend/src/seed/seed-db.js b/backend/src/seed/seed-db.js
index 225ffa834..3b3564533 100644
--- a/backend/src/seed/seed-db.js
+++ b/backend/src/seed/seed-db.js
@@ -693,24 +693,24 @@ import { gql } from '../jest/helpers'
         mutation: reportMutation,
         variables: {
           resourceId: 'c1',
-          reasonCategory: 'other',
-          reasonDescription: 'This comment is bigoted',
+          reasonCategory: 'pornographic_content_links',
+          reasonDescription: 'This comment is porno!!!',
         },
       }),
       mutate({
         mutation: reportMutation,
         variables: {
           resourceId: 'p1',
-          reasonCategory: 'discrimination_etc',
-          reasonDescription: 'This post is bigoted',
+          reasonCategory: 'intentional_intimidation_stalking_persecution',
+          reasonDescription: '',
         },
       }),
       mutate({
         mutation: reportMutation,
         variables: {
           resourceId: 'u1',
-          reasonCategory: 'doxing',
-          reasonDescription: 'This user is harassing me with bigoted remarks',
+          reasonCategory: 'glorific_trivia_of_cruel_inhuman_acts',
+          reasonDescription: 'murder',
         },
       }),
     ])
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 9c7cde641..6dc8b2b78 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -449,8 +449,10 @@
       "reasonCategory": "Kategorie",
       "reasonDescription": "Beschreibung",
       "createdAt": "Datum",
-      "submitter": "Gemeldet von / am",
-      "disabledBy": "Deaktiviert von"
+      "submitter": "Gemeldet von",
+      "disabledBy": "Deaktiviert von",
+      "decision": "Entscheidung",
+      "noDecision": "Keine Entscheidung!"
     }
   },
   "disable": {
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 9a5b0e634..816815142 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -450,8 +450,10 @@
       "reasonCategory": "Category",
       "reasonDescription": "Description",
       "createdAt": "Date",
-      "submitter": "Reported by / at",
-      "disabledBy": "Disabled by"
+      "submitter": "Reported by",
+      "disabledBy": "Disabled by",
+      "decision": "Decision",
+      "noDecision": "No decision!"
     }
   },
   "disable": {
diff --git a/webapp/pages/moderation/index.vue b/webapp/pages/moderation/index.vue
index 18aa8475c..1d485cc2c 100644
--- a/webapp/pages/moderation/index.vue
+++ b/webapp/pages/moderation/index.vue
@@ -1,251 +1,127 @@
 <template>
   <ds-card space="small">
     <ds-heading tag="h3">{{ $t('moderation.reports.name') }}</ds-heading>
-    <ds-table
-      v-if="reports && reports.length"
-      :data="reportedContentStructure"
-      :fields="contentFields"
-      condensed
+    <table
+      v-if="reportedContentStructure && reportedContentStructure.length"
+      class="ds-table ds-table-condensed ds-table-bordered"
+      cellspacing="0"
+      cellpadding="0"
     >
-      <!-- Icon -->
-      <template slot="type" slot-scope="scope">
-        <ds-text color="soft">
-          <ds-icon
-            v-if="scope.row.type === 'Post'"
-            v-tooltip="{ content: $t('report.contribution.type'), placement: 'right' }"
-            name="bookmark"
-          />
-          <ds-icon
-            v-else-if="scope.row.type === 'Comment'"
-            v-tooltip="{ content: $t('report.comment.type'), placement: 'right' }"
-            name="comments"
-          />
-          <ds-icon
-            v-else-if="scope.row.type === 'User'"
-            v-tooltip="{ content: $t('report.user.type'), placement: 'right' }"
-            name="user"
-          />
-        </ds-text>
+      <colgroup><col width="" /></colgroup>
+      <template v-for="content in reportedContentStructure">
+        <tbody :key="content.resource.id">
+          <tr valign="top">
+            <td class="ds-table-col ds-table-head-col ds-table-head-col-border">
+              <!-- Icon -->
+              <ds-text color="soft">
+                <ds-icon
+                  v-if="content.type === 'Post'"
+                  v-tooltip="{ content: $t('report.contribution.type'), placement: 'right' }"
+                  name="bookmark"
+                />
+                <ds-icon
+                  v-else-if="content.type === 'Comment'"
+                  v-tooltip="{ content: $t('report.comment.type'), placement: 'right' }"
+                  name="comments"
+                />
+                <ds-icon
+                  v-else-if="content.type === 'User'"
+                  v-tooltip="{ content: $t('report.user.type'), placement: 'right' }"
+                  name="user"
+                />
+              </ds-text>
+            </td>
+            <td class="ds-table-col ds-table-head-col-border">
+              <!-- reported user or content -->
+              <div v-if="content.type === 'Post' || content.type === 'Comment'">
+                <nuxt-link
+                  :to="{
+                    name: 'post-id-slug',
+                    params: {
+                      id: content.type === 'Post' ? content.post.id : content.comment.post.id,
+                      slug: content.type === 'Post' ? content.post.slug : content.comment.post.slug,
+                    },
+                    hash:
+                      content.type === 'Comment' ? `#commentId-${content.comment.id}` : undefined,
+                  }"
+                >
+                  <b v-if="content.type === 'Post'">{{ content.post.title | truncate(100) }}</b>
+                  <b v-else>{{ content.comment.contentExcerpt | removeHtml | truncate(100) }}</b>
+                </nuxt-link>
+              </div>
+              <div v-else>
+                <hc-user :user="content.user" :showAvatar="false" :trunc="30" />
+              </div>
+            </td>
+            <td class="ds-table-col ds-table-head-col-border">
+              <ds-flex v-if="content.contentBelongsToUser">
+                <ds-flex-item width="20px">
+                  <ds-icon
+                    v-tooltip="{ content: $t('report.author'), placement: 'right' }"
+                    name="user"
+                  />
+                </ds-flex-item>
+                <ds-flex-item>
+                  <hc-user :user="content.contentBelongsToUser" :showAvatar="false" :trunc="25" />
+                </ds-flex-item>
+              </ds-flex>
+            </td>
+            <td class="ds-table-col ds-table-head-col-border">
+              <b>{{ $t('moderation.reports.decision') }}:</b>
+              <br />
+              <!-- disabledBy -->
+              <div v-if="content.resource.disabledBy">
+                {{ $t('moderation.reports.disabledBy') }}
+                <br />
+                <nuxt-link
+                  :to="{
+                    name: 'profile-id-slug',
+                    params: {
+                      id: content.resource.disabledBy.id,
+                      slug: content.resource.disabledBy.slug,
+                    },
+                  }"
+                >
+                  <b>{{ content.resource.disabledBy.name | truncate(50) }}</b>
+                </nuxt-link>
+              </div>
+              <span v-else class="no-decision">{{ $t('moderation.reports.noDecision') }}</span>
+            </td>
+          </tr>
+          <tr>
+            <td class="ds-table-col ds-table-head-col-border"></td>
+            <td class="ds-table-col ds-table-head-col-border" colspan="3">
+              <ds-table :data="content.reports" :fields="reportFields" condensed>
+                <!-- submitter -->
+                <template slot="submitter" slot-scope="scope">
+                  <hc-user
+                    :user="scope.row.submitter"
+                    :showAvatar="false"
+                    :trunc="30"
+                    :date-time="scope.row.createdAt"
+                    :positionDatetime="'below'"
+                  />
+                </template>
+                <!-- reasonCategory -->
+                <template slot="reasonCategory" slot-scope="scope">
+                  {{ $t('report.reason.category.options.' + scope.row.reasonCategory) }}
+                </template>
+                <!-- reasonDescription -->
+                <template slot="reasonDescription" slot-scope="scope">
+                  {{ scope.row.reasonDescription.length ? scope.row.reasonDescription : '—' }}
+                </template>
+              </ds-table>
+            </td>
+          </tr>
+        </tbody>
       </template>
-      <!-- reported user or content -->
-      <template slot="reportedUserContent" slot-scope="scope">
-        <div v-if="scope.row.type === 'Post' || scope.row.type === 'Comment'">
-          <nuxt-link
-            :to="{
-              name: 'post-id-slug',
-              params: {
-                id: scope.row.type === 'Post' ? scope.row.post.id : scope.row.comment.post.id,
-                slug: scope.row.type === 'Post' ? scope.row.post.slug : scope.row.comment.post.slug,
-              },
-              hash: scope.row.type === 'Comment' ? `#commentId-${scope.row.comment.id}` : undefined,
-            }"
-          >
-            <b v-if="scope.row.type === 'Post'">{{ scope.row.post.title | truncate(100) }}</b>
-            <b v-else>{{ scope.row.comment.contentExcerpt | removeHtml | truncate(100) }}</b>
-          </nuxt-link>
-          <ds-space margin="x-small" />
-          <ds-flex>
-            <ds-flex-item width="20px">
-              <ds-icon
-                v-tooltip="{ content: $t('report.author'), placement: 'right' }"
-                name="user"
-              />
-            </ds-flex-item>
-            <ds-flex-item>
-              <hc-user
-                v-if="scope.row.contentBelongsToUser"
-                :user="scope.row.contentBelongsToUser"
-                :showAvatar="false"
-                :trunc="25"
-              />
-            </ds-flex-item>
-          </ds-flex>
-        </div>
-        <div v-else>
-          <hc-user :user="scope.row.user" :showAvatar="false" :trunc="30" />
-        </div>
-      </template>
-      <!-- disabledBy -->
-      <template slot="disabledBy" slot-scope="scope">
-        <nuxt-link
-          v-if="scope.row.resource.disabledBy"
-          :to="{
-            name: 'profile-id-slug',
-            params: {
-              id: scope.row.resource.disabledBy.id,
-              slug: scope.row.resource.disabledBy.slug,
-            },
-          }"
-        >
-          <b>{{ scope.row.resource.disabledBy.name | truncate(50) }}</b>
-        </nuxt-link>
-        <b v-else>—</b>
-      </template>
-      <!-- <template slot="reports" slot-scope="scope">
-        <ds-table
-          :data="scope.row.submitter"
-          :fields="reportFields"
-          condensed
-        > -->
-          <!-- submitter -->
-          <!-- <template slot="submitter" slot-scope="scope">
-            <hc-user
-              :user="scope.row.submitter"
-              :showAvatar="false"
-              :trunc="30"
-              :date-time="scope.row.createdAt"
-              :positionDatetime="'below'"
-            />
-          </template>
-        </ds-table>
-      </template> -->
-    </ds-table>
-    <hc-empty v-else icon="alert" :message="$t('moderation.reports.empty')" />
-    <ds-table v-if="reports && reports.length" :data="reports" :fields="fields" condensed>
-      <!-- Icon -->
-      <template slot="type" slot-scope="scope">
-        <ds-text color="soft">
-          <ds-icon
-            v-if="scope.row.type === 'Post'"
-            v-tooltip="{ content: $t('report.contribution.type'), placement: 'right' }"
-            name="bookmark"
-          />
-          <ds-icon
-            v-else-if="scope.row.type === 'Comment'"
-            v-tooltip="{ content: $t('report.comment.type'), placement: 'right' }"
-            name="comments"
-          />
-          <ds-icon
-            v-else-if="scope.row.type === 'User'"
-            v-tooltip="{ content: $t('report.user.type'), placement: 'right' }"
-            name="user"
-          />
-        </ds-text>
-      </template>
-      <!-- reported user or content -->
-      <template slot="reportedUserContent" slot-scope="scope">
-        <div v-if="scope.row.type === 'Post'">
-          <nuxt-link
-            :to="{
-              name: 'post-id-slug',
-              params: { id: scope.row.post.id, slug: scope.row.post.slug },
-            }"
-          >
-            <b>{{ scope.row.post.title | truncate(50) }}</b>
-          </nuxt-link>
-          <!-- author: Same as author of comment underneath. Maybe dry the code … -->
-          <ds-space margin="x-small" />
-          <ds-flex>
-            <ds-flex-item width="20px">
-              <ds-icon
-                v-tooltip="{ content: $t('report.user.type'), placement: 'right' }"
-                name="user"
-              />
-            </ds-flex-item>
-            <ds-flex-item>
-              <hc-user :user="scope.row.post.author" :showAvatar="false" :trunc="25" />
-            </ds-flex-item>
-          </ds-flex>
-        </div>
-        <div v-else-if="scope.row.type === 'Comment'">
-          <nuxt-link
-            :to="{
-              name: 'post-id-slug',
-              params: {
-                id: scope.row.comment.post.id,
-                slug: scope.row.comment.post.slug,
-              },
-              hash: `#commentId-${scope.row.comment.id}`,
-            }"
-          >
-            <b>{{ scope.row.comment.contentExcerpt | removeHtml | truncate(50) }}</b>
-          </nuxt-link>
-          <!-- author: Same as author of post above. Maybe dry the code … -->
-          <ds-space margin="x-small" />
-          <ds-flex>
-            <ds-flex-item width="20px">
-              <ds-icon
-                v-tooltip="{ content: $t('report.user.type'), placement: 'right' }"
-                name="user"
-              />
-            </ds-flex-item>
-            <ds-flex-item>
-              <hc-user :user="scope.row.comment.author" :showAvatar="false" :trunc="25" />
-            </ds-flex-item>
-          </ds-flex>
-        </div>
-        <div v-else>
-          <hc-user :user="scope.row.user" :showAvatar="false" :trunc="30" />
-        </div>
-      </template>
-      <!-- reasonCategory -->
-      <template slot="reasonCategory" slot-scope="scope">
-        {{ $t('report.reason.category.options.' + scope.row.reasonCategory) }}
-      </template>
-      <!-- reasonDescription -->
-      <template slot="reasonDescription" slot-scope="scope">
-        {{ scope.row.reasonDescription }}
-      </template>
-      <!-- submitter -->
-      <template slot="submitter" slot-scope="scope">
-        <hc-user
-          :user="scope.row.submitter"
-          :showAvatar="false"
-          :trunc="30"
-          :date-time="scope.row.createdAt"
-          :positionDatetime="'below'"
-        />
-      </template>
-      <!-- createdAt -->
-      <template slot="createdAt" slot-scope="scope">
-        <ds-text size="small">
-          <client-only>
-            <hc-relative-date-time :date-time="scope.row.createdAt" />
-          </client-only>
-        </ds-text>
-      </template>
-      <!-- disabledBy -->
-      <template slot="disabledBy" slot-scope="scope">
-        <nuxt-link
-          v-if="scope.row.type === 'Post' && scope.row.post.disabledBy"
-          :to="{
-            name: 'profile-id-slug',
-            params: { id: scope.row.post.disabledBy.id, slug: scope.row.post.disabledBy.slug },
-          }"
-        >
-          <b>{{ scope.row.post.disabledBy.name | truncate(50) }}</b>
-        </nuxt-link>
-        <nuxt-link
-          v-else-if="scope.row.type === 'Comment' && scope.row.comment.disabledBy"
-          :to="{
-            name: 'profile-id-slug',
-            params: {
-              id: scope.row.comment.disabledBy.id,
-              slug: scope.row.comment.disabledBy.slug,
-            },
-          }"
-        >
-          <b>{{ scope.row.comment.disabledBy.name | truncate(50) }}</b>
-        </nuxt-link>
-        <nuxt-link
-          v-else-if="scope.row.type === 'User' && scope.row.user.disabledBy"
-          :to="{
-            name: 'profile-id-slug',
-            params: { id: scope.row.user.disabledBy.id, slug: scope.row.user.disabledBy.slug },
-          }"
-        >
-          <b>{{ scope.row.user.disabledBy.name | truncate(50) }}</b>
-        </nuxt-link>
-        <b v-else>—</b>
-      </template>
-    </ds-table>
+    </table>
     <hc-empty v-else icon="alert" :message="$t('moderation.reports.empty')" />
   </ds-card>
 </template>
 
 <script>
 import HcEmpty from '~/components/Empty.vue'
-import HcRelativeDateTime from '~/components/RelativeDateTime'
 import HcUser from '~/components/User/User'
 import { reportListQuery } from '~/graphql/Moderation.js'
 
@@ -253,7 +129,6 @@ export default {
   components: {
     HcEmpty,
     HcUser,
-    HcRelativeDateTime,
   },
   data() {
     return {
@@ -271,7 +146,10 @@ export default {
     },
     reportFields() {
       return {
-        id: 'ID',
+        submitter: this.$t('moderation.reports.submitter'),
+        reasonCategory: this.$t('moderation.reports.reasonCategory'),
+        reasonDescription: this.$t('moderation.reports.reasonDescription'),
+        // Wolle createdAt: this.$t('moderation.reports.createdAt'),
       }
     },
     fields() {
@@ -301,7 +179,9 @@ export default {
               : report.type === 'Comment'
               ? report.comment
               : undefined
-          let idx = newReportedContentStructure.findIndex(content => content.resource.id === resource.id)
+          let idx = newReportedContentStructure.findIndex(
+            content => content.resource.id === resource.id,
+          )
           // if content not in content list, then push
           if (idx === -1) {
             idx = newReportedContentStructure.length
@@ -317,6 +197,7 @@ export default {
           }
           newReportedContentStructure[idx].reports.push(report)
         })
+        // Wolle !!! Sortieren !!!
         this.reportedContentStructure = newReportedContentStructure
       },
     },
@@ -329,3 +210,13 @@ export default {
   },
 }
 </script>
+
+<style lang="scss">
+// Wolle
+.ds-table-head-col-border {
+  border-bottom: $border-color-softer dotted $border-size-base;
+}
+.no-decision {
+  color: $text-color-danger;
+}
+</style>

From 78d16fb441c357747071fa4ba09377f170ff0bd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 24 Oct 2019 10:17:31 +0200
Subject: [PATCH 005/174] Change appearance of moderators reports list again

---
 webapp/locales/de.json            | 11 ++++---
 webapp/locales/en.json            | 11 ++++---
 webapp/pages/moderation/index.vue | 50 +++++++++++++++----------------
 3 files changed, 38 insertions(+), 34 deletions(-)

diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 6dc8b2b78..d70783f4c 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -446,13 +446,16 @@
     "reports": {
       "empty": "Glückwunsch, es gibt nichts zu moderieren.",
       "name": "Meldungen",
+      "type": "Typ",
+      "content": "Inhalt",
+      "author": "Autor",
+      "decision": "Entscheidung",
+      "noDecision": "Keine Entscheidung!",
+      "disabledBy": "Deaktiviert von",
       "reasonCategory": "Kategorie",
       "reasonDescription": "Beschreibung",
       "createdAt": "Datum",
-      "submitter": "Gemeldet von",
-      "disabledBy": "Deaktiviert von",
-      "decision": "Entscheidung",
-      "noDecision": "Keine Entscheidung!"
+      "submitter": "Gemeldet von"
     }
   },
   "disable": {
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 816815142..31d2c2a20 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -447,13 +447,16 @@
     "reports": {
       "empty": "Congratulations, nothing to moderate.",
       "name": "Reports",
+      "type": "Type",
+      "content": "Content",
+      "author": "Author",
+      "decision": "Decision",
+      "noDecision": "No decision!",
+      "disabledBy": "Disabled by",
       "reasonCategory": "Category",
       "reasonDescription": "Description",
       "createdAt": "Date",
-      "submitter": "Reported by",
-      "disabledBy": "Disabled by",
-      "decision": "Decision",
-      "noDecision": "No decision!"
+      "submitter": "Reported by"
     }
   },
   "disable": {
diff --git a/webapp/pages/moderation/index.vue b/webapp/pages/moderation/index.vue
index 1d485cc2c..19da03099 100644
--- a/webapp/pages/moderation/index.vue
+++ b/webapp/pages/moderation/index.vue
@@ -9,11 +9,27 @@
     >
       <colgroup><col width="" /></colgroup>
       <template v-for="content in reportedContentStructure">
-        <tbody :key="content.resource.id">
+        <thead :key="'thead-' + content.resource.id">
+          <tr valign="top">
+            <th class="ds-table-col ds-table-head-col ds-table-head-col-border">
+              {{ $t('moderation.reports.type') }}
+            </th>
+            <th class="ds-table-col ds-table-head-col ds-table-head-col-border">
+              {{ $t('moderation.reports.content') }}
+            </th>
+            <th class="ds-table-col ds-table-head-col ds-table-head-col-border">
+              {{ $t('moderation.reports.author') }}
+            </th>
+            <th class="ds-table-col ds-table-head-col ds-table-head-col-border">
+              {{ $t('moderation.reports.decision') }}
+            </th>
+          </tr>
+        </thead>
+        <tbody :key="'tbody-' + content.resource.id">
           <tr valign="top">
             <td class="ds-table-col ds-table-head-col ds-table-head-col-border">
               <!-- Icon -->
-              <ds-text color="soft">
+              <ds-text :class="[!content.resource.disabledBy && 'no-decision']" color="soft">
                 <ds-icon
                   v-if="content.type === 'Post'"
                   v-tooltip="{ content: $t('report.contribution.type'), placement: 'right' }"
@@ -62,28 +78,17 @@
                   />
                 </ds-flex-item>
                 <ds-flex-item>
-                  <hc-user :user="content.contentBelongsToUser" :showAvatar="false" :trunc="25" />
+                  <hc-user :user="content.contentBelongsToUser" :showAvatar="false" :trunc="30" />
                 </ds-flex-item>
               </ds-flex>
+              <span v-else>—</span>
             </td>
             <td class="ds-table-col ds-table-head-col-border">
-              <b>{{ $t('moderation.reports.decision') }}:</b>
-              <br />
               <!-- disabledBy -->
               <div v-if="content.resource.disabledBy">
                 {{ $t('moderation.reports.disabledBy') }}
                 <br />
-                <nuxt-link
-                  :to="{
-                    name: 'profile-id-slug',
-                    params: {
-                      id: content.resource.disabledBy.id,
-                      slug: content.resource.disabledBy.slug,
-                    },
-                  }"
-                >
-                  <b>{{ content.resource.disabledBy.name | truncate(50) }}</b>
-                </nuxt-link>
+                <hc-user :user="content.resource.disabledBy" :showAvatar="false" :trunc="30" />
               </div>
               <span v-else class="no-decision">{{ $t('moderation.reports.noDecision') }}</span>
             </td>
@@ -137,13 +142,6 @@ export default {
     }
   },
   computed: {
-    contentFields() {
-      return {
-        type: ' ',
-        reportedUserContent: ' ',
-        disabledBy: this.$t('moderation.reports.disabledBy'),
-      }
-    },
     reportFields() {
       return {
         submitter: this.$t('moderation.reports.submitter'),
@@ -152,6 +150,7 @@ export default {
         // Wolle createdAt: this.$t('moderation.reports.createdAt'),
       }
     },
+    // Wolle delete + language
     fields() {
       return {
         type: ' ',
@@ -182,7 +181,7 @@ export default {
           let idx = newReportedContentStructure.findIndex(
             content => content.resource.id === resource.id,
           )
-          // if content not in content list, then push
+          // if content not in content list, then add it
           if (idx === -1) {
             idx = newReportedContentStructure.length
             newReportedContentStructure.push({
@@ -197,7 +196,6 @@ export default {
           }
           newReportedContentStructure[idx].reports.push(report)
         })
-        // Wolle !!! Sortieren !!!
         this.reportedContentStructure = newReportedContentStructure
       },
     },
@@ -212,7 +210,7 @@ export default {
 </script>
 
 <style lang="scss">
-// Wolle
+// Wolle delete?
 .ds-table-head-col-border {
   border-bottom: $border-color-softer dotted $border-size-base;
 }

From 92605558ecb3d6535a80e40e0c6094a4e6a54008 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Fri, 25 Oct 2019 14:55:05 +0200
Subject: [PATCH 006/174] Correct spelling of comment

---
 webapp/graphql/Moderation.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/graphql/Moderation.js b/webapp/graphql/Moderation.js
index 04ac11076..27e1cf700 100644
--- a/webapp/graphql/Moderation.js
+++ b/webapp/graphql/Moderation.js
@@ -1,7 +1,7 @@
 import gql from 'graphql-tag'
 
 export const reportListQuery = () => {
-  // no limit vor the moment like before: "reports(first: 20, orderBy: createdAt_desc)"
+  // no limit for the moment like before: "reports(first: 20, orderBy: createdAt_desc)"
   return gql`
     query {
       reports(orderBy: createdAt_desc) {

From 98029a6d467b6ba8498a9ce5c5891f0b31fa5cba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Fri, 25 Oct 2019 16:45:01 +0200
Subject: [PATCH 007/174] Script to change the database structure from
 `DISABLED` to `DECIDED` relation

- Apply default properties to the relation.
---
 ...isabled_relationship_to_decided_relationship.sh} | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)
 rename neo4j/{change_report_node_to_relationship.sh => change_disabled_relationship_to_decided_relationship.sh} (59%)

diff --git a/neo4j/change_report_node_to_relationship.sh b/neo4j/change_disabled_relationship_to_decided_relationship.sh
similarity index 59%
rename from neo4j/change_report_node_to_relationship.sh
rename to neo4j/change_disabled_relationship_to_decided_relationship.sh
index f8dd639be..76703b373 100755
--- a/neo4j/change_report_node_to_relationship.sh
+++ b/neo4j/change_disabled_relationship_to_decided_relationship.sh
@@ -16,11 +16,10 @@ do
 done
 
 echo "
-MATCH (submitter:User)-[:REPORTED]->(report:Report)-[:REPORTED]->(resource)
-DETACH DELETE report
-CREATE (submitter)-[reported:REPORTED]->(resource)
-SET reported.createdAt = toString(datetime())
-SET reported.reasonCategory = 'other'
-SET reported.reasonDescription = '!!! Created automatically to ensure database consistency! Creation date is when the database manipulation happened.'
-RETURN reported;
+MATCH (moderator:User)-[disabled:DISABLED]->(resource)
+DELETE disabled
+CREATE (moderator)-[decided:DECIDED]->(resource)
+SET decided.createdAt = toString(datetime())
+SET decided.disabled = true
+RETURN decided;
 " | cypher-shell

From 6593c6ec5cadeaf2f3fe6373347e9a25ed94243d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Fri, 25 Oct 2019 16:48:25 +0200
Subject: [PATCH 008/174] Refactor the database structure from `DISABLED` to
 `DECIDED` relation

- First Step.
- Apply properties to the relation.
---
 backend/src/models/Comment.js              |  2 +-
 backend/src/models/Post.js                 |  2 +-
 backend/src/models/User.js                 |  2 +-
 backend/src/schema/resolvers/comments.js   |  2 +-
 backend/src/schema/resolvers/moderation.js | 18 +++++++++++++++---
 backend/src/schema/resolvers/posts.js      |  2 +-
 backend/src/schema/resolvers/users.js      |  2 +-
 backend/src/schema/types/type/Comment.gql  |  2 +-
 backend/src/schema/types/type/Post.gql     |  2 +-
 backend/src/schema/types/type/User.gql     |  2 +-
 10 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/backend/src/models/Comment.js b/backend/src/models/Comment.js
index c89103e5d..f596c58f1 100644
--- a/backend/src/models/Comment.js
+++ b/backend/src/models/Comment.js
@@ -27,7 +27,7 @@ module.exports = {
   },
   disabledBy: {
     type: 'relationship',
-    relationship: 'DISABLED',
+    relationship: 'DECIDED',
     target: 'User',
     direction: 'in',
   },
diff --git a/backend/src/models/Post.js b/backend/src/models/Post.js
index 5ac8378c2..bf630c419 100644
--- a/backend/src/models/Post.js
+++ b/backend/src/models/Post.js
@@ -19,7 +19,7 @@ module.exports = {
   disabled: { type: 'boolean', default: false },
   disabledBy: {
     type: 'relationship',
-    relationship: 'DISABLED',
+    relationship: 'DECIDED',
     target: 'User',
     direction: 'in',
   },
diff --git a/backend/src/models/User.js b/backend/src/models/User.js
index b24148f00..ac1eef5e4 100644
--- a/backend/src/models/User.js
+++ b/backend/src/models/User.js
@@ -44,7 +44,7 @@ module.exports = {
   friends: { type: 'relationship', relationship: 'FRIENDS', target: 'User', direction: 'both' },
   disabledBy: {
     type: 'relationship',
-    relationship: 'DISABLED',
+    relationship: 'DECIDED',
     target: 'User',
     direction: 'in',
   },
diff --git a/backend/src/schema/resolvers/comments.js b/backend/src/schema/resolvers/comments.js
index 7378238bb..ea5943269 100644
--- a/backend/src/schema/resolvers/comments.js
+++ b/backend/src/schema/resolvers/comments.js
@@ -68,7 +68,7 @@ export default {
       hasOne: {
         author: '<-[:WROTE]-(related:User)',
         post: '-[:COMMENTS]->(related:Post)',
-        disabledBy: '<-[:DISABLED]-(related:User)',
+        disabledBy: '<-[:DECIDED]-(related:User)',
       },
     }),
   },
diff --git a/backend/src/schema/resolvers/moderation.js b/backend/src/schema/resolvers/moderation.js
index d61df7545..c519d9724 100644
--- a/backend/src/schema/resolvers/moderation.js
+++ b/backend/src/schema/resolvers/moderation.js
@@ -8,7 +8,16 @@ export default {
       MATCH (resource {id: $id})
       WHERE resource:User OR resource:Comment OR resource:Post
       SET resource.disabled = true
-      MERGE (resource)<-[:DISABLED]-(u)
+      MERGE (resource)<-[decided:DECIDED]-(u)
+      SET (
+      CASE
+      WHEN decided.createdAt IS NOT NULL
+      THEN decided END).updatedAt = toString(datetime())
+      SET (
+      CASE
+      WHEN decided.createdAt IS NULL
+      THEN decided END).createdAt = toString(datetime())
+      SET decided.disabled = true
       RETURN resource {.id}
       `
       const session = driver.session()
@@ -23,11 +32,14 @@ export default {
     enable: async (object, params, { user, driver }) => {
       const { id } = params
       const cypher = `
-      MATCH (resource {id: $id})<-[d:DISABLED]-()
+      MATCH (resource {id: $id})<-[decided:DECIDED]-(:User)
       SET resource.disabled = false
-      DELETE d
+      DELETE decided
       RETURN resource {.id}
       `
+      // Wolle
+      // SET decided.updatedAt = toString(datetime())
+      // SET decided.disabled = false
       const session = driver.session()
       const res = await session.run(cypher, { id })
       session.close()
diff --git a/backend/src/schema/resolvers/posts.js b/backend/src/schema/resolvers/posts.js
index 3b3065277..de28d1000 100644
--- a/backend/src/schema/resolvers/posts.js
+++ b/backend/src/schema/resolvers/posts.js
@@ -306,7 +306,7 @@ export default {
       },
       hasOne: {
         author: '<-[:WROTE]-(related:User)',
-        disabledBy: '<-[:DISABLED]-(related:User)',
+        disabledBy: '<-[:DECIDED]-(related:User)',
         pinnedBy: '<-[:PINNED]-(related:User)',
       },
       count: {
diff --git a/backend/src/schema/resolvers/users.js b/backend/src/schema/resolvers/users.js
index 06b25b4fa..a84d04c1d 100644
--- a/backend/src/schema/resolvers/users.js
+++ b/backend/src/schema/resolvers/users.js
@@ -198,7 +198,7 @@ export default {
       },
       hasOne: {
         invitedBy: '<-[:INVITED]-(related:User)',
-        disabledBy: '<-[:DISABLED]-(related:User)',
+        disabledBy: '<-[:DECIDED]-(related:User)',
         location: '-[:IS_IN]->(related:Location)',
       },
       hasMany: {
diff --git a/backend/src/schema/types/type/Comment.gql b/backend/src/schema/types/type/Comment.gql
index 1ccf617ef..21220186a 100644
--- a/backend/src/schema/types/type/Comment.gql
+++ b/backend/src/schema/types/type/Comment.gql
@@ -9,7 +9,7 @@ type Comment {
   updatedAt: String
   deleted: Boolean
   disabled: Boolean
-  disabledBy: User @relation(name: "DISABLED", direction: "IN")
+  disabledBy: User @relation(name: "DECIDED", direction: "IN")
 }
 
 type Mutation {
diff --git a/backend/src/schema/types/type/Post.gql b/backend/src/schema/types/type/Post.gql
index b4d98ec5c..5d94d7af0 100644
--- a/backend/src/schema/types/type/Post.gql
+++ b/backend/src/schema/types/type/Post.gql
@@ -47,7 +47,7 @@ type Post {
   deleted: Boolean
   disabled: Boolean
   pinned: Boolean
-  disabledBy: User @relation(name: "DISABLED", direction: "IN")
+  disabledBy: User @relation(name: "DECIDED", direction: "IN")
   createdAt: String
   updatedAt: String
   language: String
diff --git a/backend/src/schema/types/type/User.gql b/backend/src/schema/types/type/User.gql
index cce0df058..a437fd8ef 100644
--- a/backend/src/schema/types/type/User.gql
+++ b/backend/src/schema/types/type/User.gql
@@ -8,7 +8,7 @@ type User {
   coverImg: String
   deleted: Boolean
   disabled: Boolean
-  disabledBy: User @relation(name: "DISABLED", direction: "IN")
+  disabledBy: User @relation(name: "DECIDED", direction: "IN")
   role: UserGroup!
   publicKey: String
   invitedBy: User @relation(name: "INVITED", direction: "IN")

From 8db667c1eb5cfc7ab625ec5fdee0eeef75094f3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Mon, 28 Oct 2019 14:07:44 +0100
Subject: [PATCH 009/174] Refactor disable and enable mutations to decide

---
 .../src/middleware/permissionsMiddleware.js   |  1 +
 backend/src/schema/resolvers/moderation.js    | 57 +++++++++++++++++--
 2 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/backend/src/middleware/permissionsMiddleware.js b/backend/src/middleware/permissionsMiddleware.js
index a0116a439..c4bea06a3 100644
--- a/backend/src/middleware/permissionsMiddleware.js
+++ b/backend/src/middleware/permissionsMiddleware.js
@@ -162,6 +162,7 @@ const permissions = shield(
       changePassword: isAuthenticated,
       enable: isModerator,
       disable: isModerator,
+      decide: isModerator,
       CreateComment: isAuthenticated,
       UpdateComment: isAuthor,
       DeleteComment: isAuthor,
diff --git a/backend/src/schema/resolvers/moderation.js b/backend/src/schema/resolvers/moderation.js
index c519d9724..27d8838b4 100644
--- a/backend/src/schema/resolvers/moderation.js
+++ b/backend/src/schema/resolvers/moderation.js
@@ -1,11 +1,11 @@
 export default {
   Mutation: {
     disable: async (object, params, { user, driver }) => {
-      const { id } = params
+      const { id: resourceId } = params
       const { id: userId } = user
       const cypher = `
       MATCH (u:User {id: $userId})
-      MATCH (resource {id: $id})
+      MATCH (resource {id: $resourceId})
       WHERE resource:User OR resource:Comment OR resource:Post
       SET resource.disabled = true
       MERGE (resource)<-[decided:DECIDED]-(u)
@@ -21,7 +21,7 @@ export default {
       RETURN resource {.id}
       `
       const session = driver.session()
-      const res = await session.run(cypher, { id, userId })
+      const res = await session.run(cypher, { resourceId, userId })
       session.close()
       const [resource] = res.records.map(record => {
         return record.get('resource')
@@ -30,9 +30,9 @@ export default {
       return resource.id
     },
     enable: async (object, params, { user, driver }) => {
-      const { id } = params
+      const { id: resourceId } = params
       const cypher = `
-      MATCH (resource {id: $id})<-[decided:DECIDED]-(:User)
+      MATCH (resource {id: $resourceId})<-[decided:DECIDED]-(:User)
       SET resource.disabled = false
       DELETE decided
       RETURN resource {.id}
@@ -41,7 +41,52 @@ export default {
       // SET decided.updatedAt = toString(datetime())
       // SET decided.disabled = false
       const session = driver.session()
-      const res = await session.run(cypher, { id })
+      const res = await session.run(cypher, { resourceId })
+      session.close()
+      const [resource] = res.records.map(record => {
+        return record.get('resource')
+      })
+      if (!resource) return null
+      return resource.id
+    },
+    decide: async (object, params, { user, driver }) => {
+      const { resourceId, disabled } = params
+      const { id: userId } = user
+      // is there an open decision then set params
+      const cypher = `
+      MATCH (u:User {id: $userId})-[decision:DECIDED {closed: false}]->(resource {id: $resourceId})
+      WHERE NOT decision AND (resource: User OR resource: Comment OR resource: Post)
+      RETURN decision
+      `
+      const session = driver.session()
+      const res = await session.run(cypher, { resourceId, userId })
+      session.close()
+      const [decision] = res.records.map(record => {
+        return record.get('decision')
+      })
+      if (!resource) return null
+      // is there no open decision then create one
+
+
+      const cypher = `
+      MATCH (u:User {id: $userId})
+      MATCH (resource {id: $resourceId})
+      WHERE resource:User OR resource:Comment OR resource:Post
+      SET resource.disabled = true
+      MERGE (resource)<-[decided:DECIDED]-(u)
+      SET (
+      CASE
+      WHEN decided.createdAt IS NOT NULL
+      THEN decided END).updatedAt = toString(datetime())
+      SET (
+      CASE
+      WHEN decided.createdAt IS NULL
+      THEN decided END).createdAt = toString(datetime())
+      SET decided.disabled = true
+      RETURN resource {.id}
+      `
+      const session = driver.session()
+      const res = await session.run(cypher, { resourceId, userId })
       session.close()
       const [resource] = res.records.map(record => {
         return record.get('resource')

From 7b3224327e67a2895e4bc15b8987b13c6f57f015 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Wed, 30 Oct 2019 13:51:00 +0100
Subject: [PATCH 010/174] Prepare backend for next implementation step

---
 .../validation/validationMiddleware.js        |  26 +++
 backend/src/schema/index.js                   |   2 +
 backend/src/schema/resolvers/moderation.js    | 178 +++++++++++++-----
 backend/src/schema/types/type/DECIDED.gql     |  23 +++
 ...ed_relationship_to_decided_relationship.sh |   9 +-
 5 files changed, 183 insertions(+), 55 deletions(-)
 create mode 100644 backend/src/schema/types/type/DECIDED.gql

diff --git a/backend/src/middleware/validation/validationMiddleware.js b/backend/src/middleware/validation/validationMiddleware.js
index 1dbd36b72..740f25ec4 100644
--- a/backend/src/middleware/validation/validationMiddleware.js
+++ b/backend/src/middleware/validation/validationMiddleware.js
@@ -82,6 +82,31 @@ const validateReport = async (resolve, root, args, context, info) => {
   return resolve(root, args, context, info)
 }
 
+// const validateDecide = async (resolve, root, args, context, info) => {
+//   const { resourceId } = args
+//   const { user, driver } = context
+//   if (resourceId === user.id) throw new Error('You cannot report yourself!')
+//   const session = driver.session()
+//   const reportQueryRes = await session.run(
+//     `
+//       MATCH (:User {id:$submitterId})-[:REPORTED]->(resource {id:$resourceId}) 
+//       RETURN labels(resource)[0] as label
+//     `,
+//     {
+//       resourceId,
+//       submitterId: user.id,
+//     },
+//   )
+//   const [existingReportedResource] = reportQueryRes.records.map(record => {
+//     return {
+//       label: record.get('label'),
+//     }
+//   })
+
+//   if (existingReportedResource) throw new Error(`${existingReportedResource.label}`)
+//   return resolve(root, args, context, info)
+// }
+
 export default {
   Mutation: {
     CreateComment: validateCommentCreation,
@@ -89,5 +114,6 @@ export default {
     CreatePost: validatePost,
     UpdatePost: validateUpdatePost,
     report: validateReport,
+    // decide: validateDecide,
   },
 }
diff --git a/backend/src/schema/index.js b/backend/src/schema/index.js
index 95fa9ef61..be00a1435 100644
--- a/backend/src/schema/index.js
+++ b/backend/src/schema/index.js
@@ -24,6 +24,7 @@ export default applyScalars(
             'SocialMedia',
             'NOTIFIED',
             'REPORTED',
+            'DECIDED',
           ],
           // add 'User' here as soon as possible
         },
@@ -44,6 +45,7 @@ export default applyScalars(
             'EMOTED',
             'NOTIFIED',
             'REPORTED',
+            'DECIDED',
           ],
           // add 'User' here as soon as possible
         },
diff --git a/backend/src/schema/resolvers/moderation.js b/backend/src/schema/resolvers/moderation.js
index 27d8838b4..5c4087834 100644
--- a/backend/src/schema/resolvers/moderation.js
+++ b/backend/src/schema/resolvers/moderation.js
@@ -8,16 +8,17 @@ export default {
       MATCH (resource {id: $resourceId})
       WHERE resource:User OR resource:Comment OR resource:Post
       SET resource.disabled = true
-      MERGE (resource)<-[decided:DECIDED]-(u)
+      MERGE (resource)<-[decision:DECIDED]-(u)
       SET (
       CASE
-      WHEN decided.createdAt IS NOT NULL
-      THEN decided END).updatedAt = toString(datetime())
+      WHEN decision.createdAt IS NOT NULL
+      THEN decision END).updatedAt = toString(datetime())
       SET (
       CASE
-      WHEN decided.createdAt IS NULL
-      THEN decided END).createdAt = toString(datetime())
-      SET decided.disabled = true
+      WHEN decision.createdAt IS NULL
+      THEN decision END).createdAt = toString(datetime())
+      SET decision.disabled = true
+      SET decision.closed = false
       RETURN resource {.id}
       `
       const session = driver.session()
@@ -32,14 +33,14 @@ export default {
     enable: async (object, params, { user, driver }) => {
       const { id: resourceId } = params
       const cypher = `
-      MATCH (resource {id: $resourceId})<-[decided:DECIDED]-(:User)
+      MATCH (resource {id: $resourceId})<-[decision:DECIDED]-(:User)
       SET resource.disabled = false
-      DELETE decided
+      DELETE decision
       RETURN resource {.id}
       `
       // Wolle
-      // SET decided.updatedAt = toString(datetime())
-      // SET decided.disabled = false
+      // SET decision.updatedAt = toString(datetime())
+      // SET decision.disabled = false
       const session = driver.session()
       const res = await session.run(cypher, { resourceId })
       session.close()
@@ -49,50 +50,125 @@ export default {
       if (!resource) return null
       return resource.id
     },
-    decide: async (object, params, { user, driver }) => {
-      const { resourceId, disabled } = params
-      const { id: userId } = user
-      // is there an open decision then set params
-      const cypher = `
-      MATCH (u:User {id: $userId})-[decision:DECIDED {closed: false}]->(resource {id: $resourceId})
-      WHERE NOT decision AND (resource: User OR resource: Comment OR resource: Post)
-      RETURN decision
-      `
-      const session = driver.session()
-      const res = await session.run(cypher, { resourceId, userId })
-      session.close()
-      const [decision] = res.records.map(record => {
-        return record.get('decision')
-      })
-      if (!resource) return null
-      // is there no open decision then create one
+    decide: async (object, params, context, _resolveInfo) => {
+      let createdRelationshipWithNestedAttributes = null
+      const { resourceId, disabled, closed } = params
+      const { user: moderator, driver } = context
 
-
-      const cypher = `
-      MATCH (u:User {id: $userId})
-      MATCH (resource {id: $resourceId})
-      WHERE resource:User OR resource:Comment OR resource:Post
-      SET resource.disabled = true
-      MERGE (resource)<-[decided:DECIDED]-(u)
-      SET (
-      CASE
-      WHEN decided.createdAt IS NOT NULL
-      THEN decided END).updatedAt = toString(datetime())
-      SET (
-      CASE
-      WHEN decided.createdAt IS NULL
-      THEN decided END).createdAt = toString(datetime())
-      SET decided.disabled = true
-      RETURN resource {.id}
-      `
       const session = driver.session()
-      const res = await session.run(cypher, { resourceId, userId })
-      session.close()
-      const [resource] = res.records.map(record => {
-        return record.get('resource')
+
+      const existingDecisionWriteTxResultPromise = session.writeTransaction(async txc => {
+        const decisionRelationshipTransactionResponse = await txc.run(
+          `
+            MATCH (moderator:User)-[decision:DECIDED {closed: false}]->(resource {id: $resourceId})
+            WHERE resource:User OR resource:Comment OR resource:Post
+            RETURN decision, moderator {.id} AS decisionModerator
+          `, { resourceId },
+        )
+        return decisionRelationshipTransactionResponse.records.map(record => ({
+          decision: record.get('decision'),
+          decisionModerator: record.get('decisionModerator'),
+        }))
       })
-      if (!resource) return null
-      return resource.id
+
+      try {
+        const cypherHeader = ''
+
+        // is there an open decision?
+        const existingDecisionTxResult = await existingDecisionWriteTxResultPromise
+        if (!existingDecisionTxResult[0]) {
+          // no open decision, then create one
+          if (!disabled) disabled = false // default for creation
+          if (!disabled) closed = false // default for creation
+          cypherHeader = `
+            MATCH (moderator:User {id: $moderatorId})
+            MATCH (resource {id: $resourceId})
+            WHERE resource:User OR resource:Comment OR resource:Post
+            CREATE (resource)<-[decision:DECIDED]-(moderator)
+          `
+        } else {
+          // an open decision …
+
+          if (!disabled) disabled = existingDecisionTxResult[0].decision.properties.disabled // default set to existing
+          if (!disabled) closed = existingDecisionTxResult[0].decision.properties.closed // default set to existing
+          // current moderator is not the same as old
+          if (moderator.id !== existingDecisionTxResult[0].decisionModerator.id) {
+            // an open decision from different moderator, then change relation and properties
+            cypherHeader = `
+              MATCH (moderator:User)-[oldDecision:DECIDED {closed: false}]->(resource {id: $resourceId})
+              WHERE resource:User OR resource:Comment OR resource:Post
+              DELETE oldDecision
+              MATCH (moderator:User {id: $moderatorId})
+              MATCH (resource {id: $resourceId})
+              WHERE resource:User OR resource:Comment OR resource:Post
+              CREATE (resource)<-[decision:DECIDED]-(moderator)
+              SET decision = oldDecision
+            `
+          } else {
+            // an open decision from same moderator, then change properties
+            cypherHeader = `
+              MATCH (moderator:User)-[decision:DECIDED {closed: false}]->(resource {id: $resourceId})
+              WHERE resource:User OR resource:Comment OR resource:Post
+            `
+          }
+        }
+
+        const newDecisionWriteTxResultPromise = session.writeTransaction(async txc => {
+          const decisionRelationshipTransactionResponse = await txc.run(
+            cypherHeader + `
+              SET (
+              CASE
+              WHEN decision.createdAt IS NOT NULL
+              THEN decision END).updatedAt = toString(datetime())
+              SET (
+              CASE
+              WHEN decision.createdAt IS NULL
+              THEN decision END).createdAt = toString(datetime())
+              SET decision.disabled = $disabled
+              SET decision.closed = $closed
+              SET resource.disabled = $disabled
+              RETURN decision, resource, moderator, labels(resource)[0] AS type
+            `, {
+              resourceId,
+              moderatorId: moderator.id,
+              disabled,
+              closed,
+            },
+          )
+          return decisionRelationshipTransactionResponse.records.map(record => ({
+            decision: record.get('decision'),
+            resource: record.get('resource'),
+            moderator: record.get('moderator'),
+            type: record.get('type'),
+          }))
+        })
+        const txResult = await newDecisionWriteTxResultPromise
+        if (!txResult[0]) return null
+        const { decision, resource, moderator: moderatorInResult, type } = txResult[0]
+        createdRelationshipWithNestedAttributes = {
+          ...decision.properties,
+          moderator: moderatorInResult.properties,
+          type,
+          post: null,
+          comment: null,
+          user: null,
+        }
+        switch (type) {
+          case 'Post':
+            createdRelationshipWithNestedAttributes.post = resource.properties
+            break
+          case 'Comment':
+            createdRelationshipWithNestedAttributes.comment = resource.properties
+            break
+          case 'User':
+            createdRelationshipWithNestedAttributes.user = resource.properties
+            break
+        }
+      } finally {
+        session.close()
+      }
+
+      return createdRelationshipWithNestedAttributes
     },
   },
 }
diff --git a/backend/src/schema/types/type/DECIDED.gql b/backend/src/schema/types/type/DECIDED.gql
new file mode 100644
index 000000000..0097cecfc
--- /dev/null
+++ b/backend/src/schema/types/type/DECIDED.gql
@@ -0,0 +1,23 @@
+type DECIDED {
+  createdAt: String!
+  updatedAt: String
+  # reasonCategory: ReasonCategory
+  # reasonDescription: String
+  disabled: Boolean!
+  closed: Boolean!
+  
+  moderator: User
+    @cypher(statement: "MATCH (resource)<-[:DECIDED]-(moderator:User) RETURN moderator")
+  # not yet supported
+  # resource: ReportResource
+  #   @cypher(statement: "MATCH (resource)<-[:DECIDED]-(:User) RETURN resource")
+  type: String
+    @cypher(statement: "MATCH (resource)<-[:DECIDED]-(:User) RETURN labels(resource)[0]")
+  user: User
+  post: Post
+  comment: Comment
+}
+
+type Mutation {
+  decide(resourceId: ID!, disabled: Boolean, closed: Boolean): DECIDED
+}
diff --git a/neo4j/change_disabled_relationship_to_decided_relationship.sh b/neo4j/change_disabled_relationship_to_decided_relationship.sh
index 76703b373..503af2bd5 100755
--- a/neo4j/change_disabled_relationship_to_decided_relationship.sh
+++ b/neo4j/change_disabled_relationship_to_decided_relationship.sh
@@ -18,8 +18,9 @@ done
 echo "
 MATCH (moderator:User)-[disabled:DISABLED]->(resource)
 DELETE disabled
-CREATE (moderator)-[decided:DECIDED]->(resource)
-SET decided.createdAt = toString(datetime())
-SET decided.disabled = true
-RETURN decided;
+CREATE (moderator)-[decision:DECIDED]->(resource)
+SET decision.createdAt = toString(datetime())
+SET decision.disabled = true
+SET decision.closed = false
+RETURN decision;
 " | cypher-shell

From 47d5cc89dd16bdcf8c033d2837793da478afc092 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Wed, 30 Oct 2019 15:48:46 +0100
Subject: [PATCH 011/174] Implement `last` property on `DECIDED` relation

---
 backend/src/schema/resolvers/moderation.js    | 22 +++++++++++--------
 backend/src/schema/types/type/DECIDED.gql     |  3 +++
 ...ed_relationship_to_decided_relationship.sh |  4 +---
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/backend/src/schema/resolvers/moderation.js b/backend/src/schema/resolvers/moderation.js
index 5c4087834..f7f5d0c33 100644
--- a/backend/src/schema/resolvers/moderation.js
+++ b/backend/src/schema/resolvers/moderation.js
@@ -17,8 +17,7 @@ export default {
       CASE
       WHEN decision.createdAt IS NULL
       THEN decision END).createdAt = toString(datetime())
-      SET decision.disabled = true
-      SET decision.closed = false
+      SET decision.disabled = true, decision.closed = false, decision.last = true
       RETURN resource {.id}
       `
       const session = driver.session()
@@ -75,8 +74,8 @@ export default {
         const cypherHeader = ''
 
         // is there an open decision?
-        const existingDecisionTxResult = await existingDecisionWriteTxResultPromise
-        if (!existingDecisionTxResult[0]) {
+        const [existingDecisionTxResult] = await existingDecisionWriteTxResultPromise
+        if (!existingDecisionTxResult) {
           // no open decision, then create one
           if (!disabled) disabled = false // default for creation
           if (!disabled) closed = false // default for creation
@@ -85,14 +84,20 @@ export default {
             MATCH (resource {id: $resourceId})
             WHERE resource:User OR resource:Comment OR resource:Post
             CREATE (resource)<-[decision:DECIDED]-(moderator)
+            SET decision.last = true
+            OPTIONAL MATCH (:User)-[lastDecision:DECIDED {last: true}]->(resource)
+            SET (
+            CASE
+            WHEN lastDecision IS NOT NULL
+            THEN lastDecision END).last = false
           `
         } else {
           // an open decision …
 
-          if (!disabled) disabled = existingDecisionTxResult[0].decision.properties.disabled // default set to existing
-          if (!disabled) closed = existingDecisionTxResult[0].decision.properties.closed // default set to existing
+          if (!disabled) disabled = existingDecisionTxResult.decision.properties.disabled // default set to existing
+          if (!disabled) closed = existingDecisionTxResult.decision.properties.closed // default set to existing
           // current moderator is not the same as old
-          if (moderator.id !== existingDecisionTxResult[0].decisionModerator.id) {
+          if (moderator.id !== existingDecisionTxResult.decisionModerator.id) {
             // an open decision from different moderator, then change relation and properties
             cypherHeader = `
               MATCH (moderator:User)-[oldDecision:DECIDED {closed: false}]->(resource {id: $resourceId})
@@ -124,8 +129,7 @@ export default {
               CASE
               WHEN decision.createdAt IS NULL
               THEN decision END).createdAt = toString(datetime())
-              SET decision.disabled = $disabled
-              SET decision.closed = $closed
+              SET decision.disabled = $disabled, decision.closed = $closed
               SET resource.disabled = $disabled
               RETURN decision, resource, moderator, labels(resource)[0] AS type
             `, {
diff --git a/backend/src/schema/types/type/DECIDED.gql b/backend/src/schema/types/type/DECIDED.gql
index 0097cecfc..073730403 100644
--- a/backend/src/schema/types/type/DECIDED.gql
+++ b/backend/src/schema/types/type/DECIDED.gql
@@ -5,6 +5,9 @@ type DECIDED {
   # reasonDescription: String
   disabled: Boolean!
   closed: Boolean!
+
+  # internal
+  last: Boolean!
   
   moderator: User
     @cypher(statement: "MATCH (resource)<-[:DECIDED]-(moderator:User) RETURN moderator")
diff --git a/neo4j/change_disabled_relationship_to_decided_relationship.sh b/neo4j/change_disabled_relationship_to_decided_relationship.sh
index 503af2bd5..baa147bcc 100755
--- a/neo4j/change_disabled_relationship_to_decided_relationship.sh
+++ b/neo4j/change_disabled_relationship_to_decided_relationship.sh
@@ -19,8 +19,6 @@ echo "
 MATCH (moderator:User)-[disabled:DISABLED]->(resource)
 DELETE disabled
 CREATE (moderator)-[decision:DECIDED]->(resource)
-SET decision.createdAt = toString(datetime())
-SET decision.disabled = true
-SET decision.closed = false
+SET decision.createdAt = toString(datetime()), decision.disabled = true, decision.last = true, decision.closed = false
 RETURN decision;
 " | cypher-shell

From 54be7782ba32f0f4947da1e507cb1447a9e52681 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Wed, 30 Oct 2019 16:59:24 +0100
Subject: [PATCH 012/174] First refactoring tests to new database structure

---
 backend/src/models/Comment.js                 |  2 +-
 backend/src/models/Post.js                    |  2 +-
 backend/src/models/User.js                    |  2 +-
 backend/src/schema/resolvers/comments.js      |  2 +-
 backend/src/schema/resolvers/moderation.js    | 42 +++++++++----------
 .../src/schema/resolvers/moderation.spec.js   | 24 +++++------
 backend/src/schema/resolvers/posts.js         |  2 +-
 backend/src/schema/resolvers/users.js         |  2 +-
 backend/src/schema/types/type/Comment.gql     |  2 +-
 backend/src/schema/types/type/Post.gql        |  2 +-
 backend/src/schema/types/type/User.gql        |  2 +-
 webapp/graphql/Moderation.js                  |  6 +--
 webapp/pages/moderation/index.vue             |  9 ++--
 13 files changed, 51 insertions(+), 48 deletions(-)

diff --git a/backend/src/models/Comment.js b/backend/src/models/Comment.js
index f596c58f1..ee2f9512d 100644
--- a/backend/src/models/Comment.js
+++ b/backend/src/models/Comment.js
@@ -25,7 +25,7 @@ module.exports = {
     target: 'User',
     direction: 'in',
   },
-  disabledBy: {
+  decidedByModerator: {
     type: 'relationship',
     relationship: 'DECIDED',
     target: 'User',
diff --git a/backend/src/models/Post.js b/backend/src/models/Post.js
index bf630c419..2d812d491 100644
--- a/backend/src/models/Post.js
+++ b/backend/src/models/Post.js
@@ -17,7 +17,7 @@ module.exports = {
   image: { type: 'string', allow: [null] },
   deleted: { type: 'boolean', default: false },
   disabled: { type: 'boolean', default: false },
-  disabledBy: {
+  decidedByModerator: {
     type: 'relationship',
     relationship: 'DECIDED',
     target: 'User',
diff --git a/backend/src/models/User.js b/backend/src/models/User.js
index ac1eef5e4..329ee6f8d 100644
--- a/backend/src/models/User.js
+++ b/backend/src/models/User.js
@@ -42,7 +42,7 @@ module.exports = {
     },
   },
   friends: { type: 'relationship', relationship: 'FRIENDS', target: 'User', direction: 'both' },
-  disabledBy: {
+  decidedByModerator: {
     type: 'relationship',
     relationship: 'DECIDED',
     target: 'User',
diff --git a/backend/src/schema/resolvers/comments.js b/backend/src/schema/resolvers/comments.js
index ea5943269..4867b8700 100644
--- a/backend/src/schema/resolvers/comments.js
+++ b/backend/src/schema/resolvers/comments.js
@@ -68,7 +68,7 @@ export default {
       hasOne: {
         author: '<-[:WROTE]-(related:User)',
         post: '-[:COMMENTS]->(related:Post)',
-        disabledBy: '<-[:DECIDED]-(related:User)',
+        decidedByModerator: '<-[:DECIDED]-(related:User)',
       },
     }),
   },
diff --git a/backend/src/schema/resolvers/moderation.js b/backend/src/schema/resolvers/moderation.js
index f7f5d0c33..33d021656 100644
--- a/backend/src/schema/resolvers/moderation.js
+++ b/backend/src/schema/resolvers/moderation.js
@@ -4,21 +4,21 @@ export default {
       const { id: resourceId } = params
       const { id: userId } = user
       const cypher = `
-      MATCH (u:User {id: $userId})
-      MATCH (resource {id: $resourceId})
-      WHERE resource:User OR resource:Comment OR resource:Post
-      SET resource.disabled = true
-      MERGE (resource)<-[decision:DECIDED]-(u)
-      SET (
-      CASE
-      WHEN decision.createdAt IS NOT NULL
-      THEN decision END).updatedAt = toString(datetime())
-      SET (
-      CASE
-      WHEN decision.createdAt IS NULL
-      THEN decision END).createdAt = toString(datetime())
-      SET decision.disabled = true, decision.closed = false, decision.last = true
-      RETURN resource {.id}
+        MATCH (u:User {id: $userId})
+        MATCH (resource {id: $resourceId})
+        WHERE resource:User OR resource:Comment OR resource:Post
+        SET resource.disabled = true
+        MERGE (resource)<-[decision:DECIDED]-(u)
+        SET (
+        CASE
+        WHEN decision.createdAt IS NOT NULL
+        THEN decision END).updatedAt = toString(datetime())
+        SET (
+        CASE
+        WHEN decision.createdAt IS NULL
+        THEN decision END).createdAt = toString(datetime())
+        SET decision.disabled = true, decision.closed = false, decision.last = true
+        RETURN resource {.id}
       `
       const session = driver.session()
       const res = await session.run(cypher, { resourceId, userId })
@@ -32,14 +32,14 @@ export default {
     enable: async (object, params, { user, driver }) => {
       const { id: resourceId } = params
       const cypher = `
-      MATCH (resource {id: $resourceId})<-[decision:DECIDED]-(:User)
-      SET resource.disabled = false
-      DELETE decision
-      RETURN resource {.id}
+        MATCH (resource {id: $resourceId})<-[decision:DECIDED]-(:User)
+        SET resource.disabled = false
+        SET decision.disabled = false, decision.updatedAt = toString(datetime())
+        RETURN resource {.id}
       `
       // Wolle
-      // SET decision.updatedAt = toString(datetime())
-      // SET decision.disabled = false
+      // DELETE decision
+
       const session = driver.session()
       const res = await session.run(cypher, { resourceId })
       session.close()
diff --git a/backend/src/schema/resolvers/moderation.spec.js b/backend/src/schema/resolvers/moderation.spec.js
index 2ac0dd934..531bec693 100644
--- a/backend/src/schema/resolvers/moderation.spec.js
+++ b/backend/src/schema/resolvers/moderation.spec.js
@@ -26,7 +26,7 @@ const commentQuery = gql`
     Comment(id: $id) {
       id
       disabled
-      disabledBy {
+      decidedByModerator {
         id
       }
     }
@@ -38,7 +38,7 @@ const postQuery = gql`
     Post(id: $id) {
       id
       disabled
-      disabledBy {
+      decidedByModerator {
         id
       }
     }
@@ -144,11 +144,11 @@ describe('moderate resources', () => {
             })
           })
 
-          it('changes .disabledBy', async () => {
+          it('changes .decidedByModerator', async () => {
             variables = { id: 'comment-id' }
-            const before = { data: { Comment: [{ id: 'comment-id', disabledBy: null }] } }
+            const before = { data: { Comment: [{ id: 'comment-id', decidedByModerator: null }] } }
             const expected = {
-              data: { Comment: [{ id: 'comment-id', disabledBy: { id: 'moderator-id' } }] },
+              data: { Comment: [{ id: 'comment-id', decidedByModerator: { id: 'moderator-id' } }] },
             }
             await expect(query({ query: commentQuery, variables })).resolves.toMatchObject(before)
             await expect(mutate({ mutation: disableMutation, variables })).resolves.toMatchObject({
@@ -185,11 +185,11 @@ describe('moderate resources', () => {
             })
           })
 
-          it('changes .disabledBy', async () => {
+          it('changes .decidedByModerator', async () => {
             variables = { id: 'sample-post-id' }
-            const before = { data: { Post: [{ id: 'sample-post-id', disabledBy: null }] } }
+            const before = { data: { Post: [{ id: 'sample-post-id', decidedByModerator: null }] } }
             const expected = {
-              data: { Post: [{ id: 'sample-post-id', disabledBy: { id: 'moderator-id' } }] },
+              data: { Post: [{ id: 'sample-post-id', decidedByModerator: { id: 'moderator-id' } }] },
             }
 
             await expect(query({ query: postQuery, variables })).resolves.toMatchObject(before)
@@ -278,9 +278,9 @@ describe('moderate resources', () => {
             })
           })
 
-          it('changes .disabledBy', async () => {
+          it('changes .decidedByModerator', async () => {
             const expected = {
-              data: { Comment: [{ id: 'comment-id', disabledBy: null }] },
+              data: { Comment: [{ id: 'comment-id', decidedByModerator: { id: 'moderator-id' } }] },
               errors: undefined,
             }
             await expect(mutate({ mutation: enableMutation, variables })).resolves.toMatchObject({
@@ -320,9 +320,9 @@ describe('moderate resources', () => {
             })
           })
 
-          it('changes .disabledBy', async () => {
+          it('changes .decidedByModerator', async () => {
             const expected = {
-              data: { Post: [{ id: 'post-id', disabledBy: null }] },
+              data: { Post: [{ id: 'post-id', decidedByModerator: { id: 'moderator-id' } }] },
               errors: undefined,
             }
             await expect(mutate({ mutation: enableMutation, variables })).resolves.toMatchObject({
diff --git a/backend/src/schema/resolvers/posts.js b/backend/src/schema/resolvers/posts.js
index de28d1000..f2a083e52 100644
--- a/backend/src/schema/resolvers/posts.js
+++ b/backend/src/schema/resolvers/posts.js
@@ -306,7 +306,7 @@ export default {
       },
       hasOne: {
         author: '<-[:WROTE]-(related:User)',
-        disabledBy: '<-[:DECIDED]-(related:User)',
+        decidedByModerator: '<-[:DECIDED]-(related:User)',
         pinnedBy: '<-[:PINNED]-(related:User)',
       },
       count: {
diff --git a/backend/src/schema/resolvers/users.js b/backend/src/schema/resolvers/users.js
index a84d04c1d..82f6fcfb5 100644
--- a/backend/src/schema/resolvers/users.js
+++ b/backend/src/schema/resolvers/users.js
@@ -198,7 +198,7 @@ export default {
       },
       hasOne: {
         invitedBy: '<-[:INVITED]-(related:User)',
-        disabledBy: '<-[:DECIDED]-(related:User)',
+        decidedByModerator: '<-[:DECIDED]-(related:User)',
         location: '-[:IS_IN]->(related:Location)',
       },
       hasMany: {
diff --git a/backend/src/schema/types/type/Comment.gql b/backend/src/schema/types/type/Comment.gql
index 21220186a..4c1b9968e 100644
--- a/backend/src/schema/types/type/Comment.gql
+++ b/backend/src/schema/types/type/Comment.gql
@@ -9,7 +9,7 @@ type Comment {
   updatedAt: String
   deleted: Boolean
   disabled: Boolean
-  disabledBy: User @relation(name: "DECIDED", direction: "IN")
+  decidedByModerator: User @relation(name: "DECIDED", direction: "IN")
 }
 
 type Mutation {
diff --git a/backend/src/schema/types/type/Post.gql b/backend/src/schema/types/type/Post.gql
index 5d94d7af0..77ec432e2 100644
--- a/backend/src/schema/types/type/Post.gql
+++ b/backend/src/schema/types/type/Post.gql
@@ -47,7 +47,7 @@ type Post {
   deleted: Boolean
   disabled: Boolean
   pinned: Boolean
-  disabledBy: User @relation(name: "DECIDED", direction: "IN")
+  decidedByModerator: User @relation(name: "DECIDED", direction: "IN")
   createdAt: String
   updatedAt: String
   language: String
diff --git a/backend/src/schema/types/type/User.gql b/backend/src/schema/types/type/User.gql
index a437fd8ef..ebe9c2a3c 100644
--- a/backend/src/schema/types/type/User.gql
+++ b/backend/src/schema/types/type/User.gql
@@ -8,7 +8,7 @@ type User {
   coverImg: String
   deleted: Boolean
   disabled: Boolean
-  disabledBy: User @relation(name: "DECIDED", direction: "IN")
+  decidedByModerator: User @relation(name: "DECIDED", direction: "IN")
   role: UserGroup!
   publicKey: String
   invitedBy: User @relation(name: "INVITED", direction: "IN")
diff --git a/webapp/graphql/Moderation.js b/webapp/graphql/Moderation.js
index 27e1cf700..391c08062 100644
--- a/webapp/graphql/Moderation.js
+++ b/webapp/graphql/Moderation.js
@@ -25,7 +25,7 @@ export const reportListQuery = () => {
           name
           disabled
           deleted
-          disabledBy {
+          decidedByModerator {
             id
             slug
             name
@@ -56,7 +56,7 @@ export const reportListQuery = () => {
             disabled
             deleted
           }
-          disabledBy {
+          decidedByModerator {
             id
             slug
             name
@@ -80,7 +80,7 @@ export const reportListQuery = () => {
             contributionsCount
             commentedCount
           }
-          disabledBy {
+          decidedByModerator {
             id
             slug
             name
diff --git a/webapp/pages/moderation/index.vue b/webapp/pages/moderation/index.vue
index 19da03099..13db490ff 100644
--- a/webapp/pages/moderation/index.vue
+++ b/webapp/pages/moderation/index.vue
@@ -29,7 +29,10 @@
           <tr valign="top">
             <td class="ds-table-col ds-table-head-col ds-table-head-col-border">
               <!-- Icon -->
-              <ds-text :class="[!content.resource.disabledBy && 'no-decision']" color="soft">
+              <ds-text
+                :class="[!content.resource.decidedByModerator && 'no-decision']"
+                color="soft"
+              >
                 <ds-icon
                   v-if="content.type === 'Post'"
                   v-tooltip="{ content: $t('report.contribution.type'), placement: 'right' }"
@@ -85,10 +88,10 @@
             </td>
             <td class="ds-table-col ds-table-head-col-border">
               <!-- disabledBy -->
-              <div v-if="content.resource.disabledBy">
+              <div v-if="content.resource.decidedByModerator">
                 {{ $t('moderation.reports.disabledBy') }}
                 <br />
-                <hc-user :user="content.resource.disabledBy" :showAvatar="false" :trunc="30" />
+                <hc-user :user="content.resource.decidedByModerator" :showAvatar="false" :trunc="30" />
               </div>
               <span v-else class="no-decision">{{ $t('moderation.reports.noDecision') }}</span>
             </td>

From 21e82d2ea5068f9f98df8ceb6d68f66b0bee53ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Wed, 30 Oct 2019 19:01:54 +0100
Subject: [PATCH 013/174] Get decide mutation to work

- Tests are not fully working yet!
---
 .../validation/validationMiddleware.js        |  2 +-
 backend/src/schema/resolvers/moderation.js    | 68 +++++++++----------
 .../src/schema/resolvers/moderation.spec.js   | 27 +++++---
 backend/src/schema/types/type/REPORTED.gql    |  2 +
 webapp/pages/moderation/index.vue             |  6 +-
 5 files changed, 60 insertions(+), 45 deletions(-)

diff --git a/backend/src/middleware/validation/validationMiddleware.js b/backend/src/middleware/validation/validationMiddleware.js
index 740f25ec4..1a31fe891 100644
--- a/backend/src/middleware/validation/validationMiddleware.js
+++ b/backend/src/middleware/validation/validationMiddleware.js
@@ -89,7 +89,7 @@ const validateReport = async (resolve, root, args, context, info) => {
 //   const session = driver.session()
 //   const reportQueryRes = await session.run(
 //     `
-//       MATCH (:User {id:$submitterId})-[:REPORTED]->(resource {id:$resourceId}) 
+//       MATCH (:User {id:$submitterId})-[:REPORTED]->(resource {id:$resourceId})
 //       RETURN labels(resource)[0] as label
 //     `,
 //     {
diff --git a/backend/src/schema/resolvers/moderation.js b/backend/src/schema/resolvers/moderation.js
index 33d021656..e5e2c580c 100644
--- a/backend/src/schema/resolvers/moderation.js
+++ b/backend/src/schema/resolvers/moderation.js
@@ -37,9 +37,6 @@ export default {
         SET decision.disabled = false, decision.updatedAt = toString(datetime())
         RETURN resource {.id}
       `
-      // Wolle
-      // DELETE decision
-
       const session = driver.session()
       const res = await session.run(cypher, { resourceId })
       session.close()
@@ -51,7 +48,8 @@ export default {
     },
     decide: async (object, params, context, _resolveInfo) => {
       let createdRelationshipWithNestedAttributes = null
-      const { resourceId, disabled, closed } = params
+      const { resourceId } = params
+      let { disabled, closed } = params
       const { user: moderator, driver } = context
 
       const session = driver.session()
@@ -62,7 +60,8 @@ export default {
             MATCH (moderator:User)-[decision:DECIDED {closed: false}]->(resource {id: $resourceId})
             WHERE resource:User OR resource:Comment OR resource:Post
             RETURN decision, moderator {.id} AS decisionModerator
-          `, { resourceId },
+          `,
+          { resourceId },
         )
         return decisionRelationshipTransactionResponse.records.map(record => ({
           decision: record.get('decision'),
@@ -71,31 +70,32 @@ export default {
       })
 
       try {
-        const cypherHeader = ''
+        let cypherHeader = ''
 
         // is there an open decision?
         const [existingDecisionTxResult] = await existingDecisionWriteTxResultPromise
         if (!existingDecisionTxResult) {
           // no open decision, then create one
-          if (!disabled) disabled = false // default for creation
-          if (!disabled) closed = false // default for creation
+          if (disabled === undefined) disabled = false // default for creation
+          if (closed === undefined) closed = false // default for creation
           cypherHeader = `
             MATCH (moderator:User {id: $moderatorId})
             MATCH (resource {id: $resourceId})
             WHERE resource:User OR resource:Comment OR resource:Post
             CREATE (resource)<-[decision:DECIDED]-(moderator)
             SET decision.last = true
+            WITH decision, resource, moderator
             OPTIONAL MATCH (:User)-[lastDecision:DECIDED {last: true}]->(resource)
             SET (
             CASE
             WHEN lastDecision IS NOT NULL
             THEN lastDecision END).last = false
-          `
+            `
         } else {
           // an open decision …
-
-          if (!disabled) disabled = existingDecisionTxResult.decision.properties.disabled // default set to existing
-          if (!disabled) closed = existingDecisionTxResult.decision.properties.closed // default set to existing
+          if (disabled === undefined)
+            disabled = existingDecisionTxResult.decision.properties.disabled // default set to existing
+          if (closed === undefined) closed = existingDecisionTxResult.decision.properties.closed // default set to existing
           // current moderator is not the same as old
           if (moderator.id !== existingDecisionTxResult.decisionModerator.id) {
             // an open decision from different moderator, then change relation and properties
@@ -108,37 +108,37 @@ export default {
               WHERE resource:User OR resource:Comment OR resource:Post
               CREATE (resource)<-[decision:DECIDED]-(moderator)
               SET decision = oldDecision
-            `
+              `
           } else {
             // an open decision from same moderator, then change properties
             cypherHeader = `
               MATCH (moderator:User)-[decision:DECIDED {closed: false}]->(resource {id: $resourceId})
               WHERE resource:User OR resource:Comment OR resource:Post
-            `
+              `
           }
         }
+        const cypher =
+          cypherHeader +
+          `SET (
+            CASE
+            WHEN decision.createdAt IS NOT NULL
+            THEN decision END).updatedAt = toString(datetime())
+            SET (
+            CASE
+            WHEN decision.createdAt IS NULL
+            THEN decision END).createdAt = toString(datetime())
+            SET decision.disabled = $disabled, decision.closed = $closed
+            SET resource.disabled = $disabled
+            RETURN decision, resource, moderator, labels(resource)[0] AS type
+          `
 
         const newDecisionWriteTxResultPromise = session.writeTransaction(async txc => {
-          const decisionRelationshipTransactionResponse = await txc.run(
-            cypherHeader + `
-              SET (
-              CASE
-              WHEN decision.createdAt IS NOT NULL
-              THEN decision END).updatedAt = toString(datetime())
-              SET (
-              CASE
-              WHEN decision.createdAt IS NULL
-              THEN decision END).createdAt = toString(datetime())
-              SET decision.disabled = $disabled, decision.closed = $closed
-              SET resource.disabled = $disabled
-              RETURN decision, resource, moderator, labels(resource)[0] AS type
-            `, {
-              resourceId,
-              moderatorId: moderator.id,
-              disabled,
-              closed,
-            },
-          )
+          const decisionRelationshipTransactionResponse = await txc.run(cypher, {
+            resourceId,
+            moderatorId: moderator.id,
+            disabled,
+            closed,
+          })
           return decisionRelationshipTransactionResponse.records.map(record => ({
             decision: record.get('decision'),
             resource: record.get('resource'),
diff --git a/backend/src/schema/resolvers/moderation.spec.js b/backend/src/schema/resolvers/moderation.spec.js
index 531bec693..242a8c3fa 100644
--- a/backend/src/schema/resolvers/moderation.spec.js
+++ b/backend/src/schema/resolvers/moderation.spec.js
@@ -12,7 +12,14 @@ let query, mutate, authenticatedUser, variables, moderator, nonModerator
 
 const disableMutation = gql`
   mutation($id: ID!) {
-    disable(id: $id)
+    decide(resourceId: $id, disabled: true, closed: false) {
+      post {
+        id
+      }
+      comment {
+        id
+      }
+    }
   }
 `
 const enableMutation = gql`
@@ -123,7 +130,7 @@ describe('moderate resources', () => {
 
           it('returns null', async () => {
             await expect(mutate({ mutation: disableMutation, variables })).resolves.toMatchObject({
-              data: { disable: null },
+              data: { decide: null },
             })
           })
         })
@@ -139,7 +146,7 @@ describe('moderate resources', () => {
           it('returns disabled resource id', async () => {
             variables = { id: 'comment-id' }
             await expect(mutate({ mutation: disableMutation, variables })).resolves.toMatchObject({
-              data: { disable: 'comment-id' },
+              data: { decide: { comment: { id: 'comment-id' } } },
               errors: undefined,
             })
           })
@@ -152,7 +159,7 @@ describe('moderate resources', () => {
             }
             await expect(query({ query: commentQuery, variables })).resolves.toMatchObject(before)
             await expect(mutate({ mutation: disableMutation, variables })).resolves.toMatchObject({
-              data: { disable: 'comment-id' },
+              data: { decide: { comment: { id: 'comment-id' } } },
             })
             await expect(query({ query: commentQuery, variables })).resolves.toMatchObject(expected)
           })
@@ -164,7 +171,7 @@ describe('moderate resources', () => {
 
             await expect(query({ query: commentQuery, variables })).resolves.toMatchObject(before)
             await expect(mutate({ mutation: disableMutation, variables })).resolves.toMatchObject({
-              data: { disable: 'comment-id' },
+              data: { decide: { comment: { id: 'comment-id' } } },
             })
             await expect(query({ query: commentQuery, variables })).resolves.toMatchObject(expected)
           })
@@ -181,7 +188,7 @@ describe('moderate resources', () => {
           it('returns disabled resource id', async () => {
             variables = { id: 'sample-post-id' }
             await expect(mutate({ mutation: disableMutation, variables })).resolves.toMatchObject({
-              data: { disable: 'sample-post-id' },
+              data: { decide: { post: { id: 'sample-post-id' } } },
             })
           })
 
@@ -189,12 +196,14 @@ describe('moderate resources', () => {
             variables = { id: 'sample-post-id' }
             const before = { data: { Post: [{ id: 'sample-post-id', decidedByModerator: null }] } }
             const expected = {
-              data: { Post: [{ id: 'sample-post-id', decidedByModerator: { id: 'moderator-id' } }] },
+              data: {
+                Post: [{ id: 'sample-post-id', decidedByModerator: { id: 'moderator-id' } }],
+              },
             }
 
             await expect(query({ query: postQuery, variables })).resolves.toMatchObject(before)
             await expect(mutate({ mutation: disableMutation, variables })).resolves.toMatchObject({
-              data: { disable: 'sample-post-id' },
+              data: { decide: { post: { id: 'sample-post-id' } } },
             })
             await expect(query({ query: postQuery, variables })).resolves.toMatchObject(expected)
           })
@@ -206,7 +215,7 @@ describe('moderate resources', () => {
 
             await expect(query({ query: postQuery, variables })).resolves.toMatchObject(before)
             await expect(mutate({ mutation: disableMutation, variables })).resolves.toMatchObject({
-              data: { disable: 'sample-post-id' },
+              data: { decide: { post: { id: 'sample-post-id' } } },
             })
             await expect(query({ query: postQuery, variables })).resolves.toMatchObject(expected)
           })
diff --git a/backend/src/schema/types/type/REPORTED.gql b/backend/src/schema/types/type/REPORTED.gql
index 5042672a7..abbf2a7d4 100644
--- a/backend/src/schema/types/type/REPORTED.gql
+++ b/backend/src/schema/types/type/REPORTED.gql
@@ -12,6 +12,8 @@ type REPORTED {
   user: User
   post: Post
   comment: Comment
+
+  # decided: DECIDED
 }
 
 # this list equals the strings of an array in file "webapp/constants/modals.js"
diff --git a/webapp/pages/moderation/index.vue b/webapp/pages/moderation/index.vue
index 13db490ff..35c8addfb 100644
--- a/webapp/pages/moderation/index.vue
+++ b/webapp/pages/moderation/index.vue
@@ -91,7 +91,11 @@
               <div v-if="content.resource.decidedByModerator">
                 {{ $t('moderation.reports.disabledBy') }}
                 <br />
-                <hc-user :user="content.resource.decidedByModerator" :showAvatar="false" :trunc="30" />
+                <hc-user
+                  :user="content.resource.decidedByModerator"
+                  :showAvatar="false"
+                  :trunc="30"
+                />
               </div>
               <span v-else class="no-decision">{{ $t('moderation.reports.noDecision') }}</span>
             </td>

From f82603977731906e0aadf755c8a79ae40c0b38f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Mon, 4 Nov 2019 18:33:55 +0100
Subject: [PATCH 014/174] Get the backend tests with `decide` mutation to work
 #1

---
 backend/src/schema/resolvers/moderation.js    |  25 +-
 .../src/schema/resolvers/moderation.spec.js   | 221 +++++++++++++-----
 backend/src/schema/types/type/DECIDED.gql     |   4 +-
 ...ed_relationship_to_decided_relationship.sh |   2 +-
 4 files changed, 183 insertions(+), 69 deletions(-)

diff --git a/backend/src/schema/resolvers/moderation.js b/backend/src/schema/resolvers/moderation.js
index e5e2c580c..072bbb700 100644
--- a/backend/src/schema/resolvers/moderation.js
+++ b/backend/src/schema/resolvers/moderation.js
@@ -17,7 +17,7 @@ export default {
         CASE
         WHEN decision.createdAt IS NULL
         THEN decision END).createdAt = toString(datetime())
-        SET decision.disabled = true, decision.closed = false, decision.last = true
+        SET decision.disable = true, decision.closed = false, decision.last = true
         RETURN resource {.id}
       `
       const session = driver.session()
@@ -34,7 +34,7 @@ export default {
       const cypher = `
         MATCH (resource {id: $resourceId})<-[decision:DECIDED]-(:User)
         SET resource.disabled = false
-        SET decision.disabled = false, decision.updatedAt = toString(datetime())
+        SET decision.disable = false, decision.updatedAt = toString(datetime())
         RETURN resource {.id}
       `
       const session = driver.session()
@@ -46,10 +46,13 @@ export default {
       if (!resource) return null
       return resource.id
     },
-    decide: async (object, params, context, _resolveInfo) => {
+    decide: async (_object, params, context, _resolveInfo) => {
       let createdRelationshipWithNestedAttributes = null
+      // Wolle console.log('params: ', params)
       const { resourceId } = params
-      let { disabled, closed } = params
+      // Wolle console.log('resourceId: ', resourceId)
+      let { disable, closed } = params
+      // Wolle console.log('disable: ', disable)
       const { user: moderator, driver } = context
 
       const session = driver.session()
@@ -76,7 +79,7 @@ export default {
         const [existingDecisionTxResult] = await existingDecisionWriteTxResultPromise
         if (!existingDecisionTxResult) {
           // no open decision, then create one
-          if (disabled === undefined) disabled = false // default for creation
+          if (disable === undefined) disable = false // default for creation
           if (closed === undefined) closed = false // default for creation
           cypherHeader = `
             MATCH (moderator:User {id: $moderatorId})
@@ -93,8 +96,8 @@ export default {
             `
         } else {
           // an open decision …
-          if (disabled === undefined)
-            disabled = existingDecisionTxResult.decision.properties.disabled // default set to existing
+          if (disable === undefined)
+            disable = existingDecisionTxResult.decision.properties.disable // default set to existing
           if (closed === undefined) closed = existingDecisionTxResult.decision.properties.closed // default set to existing
           // current moderator is not the same as old
           if (moderator.id !== existingDecisionTxResult.decisionModerator.id) {
@@ -127,16 +130,18 @@ export default {
             CASE
             WHEN decision.createdAt IS NULL
             THEN decision END).createdAt = toString(datetime())
-            SET decision.disabled = $disabled, decision.closed = $closed
-            SET resource.disabled = $disabled
+            SET decision.disable = $disable, decision.closed = $closed
+            SET resource.disabled = $disable
             RETURN decision, resource, moderator, labels(resource)[0] AS type
           `
+        // Wolle console.log('cypher: ', cypher)
+        // console.log('disable: ', disable)
 
         const newDecisionWriteTxResultPromise = session.writeTransaction(async txc => {
           const decisionRelationshipTransactionResponse = await txc.run(cypher, {
             resourceId,
             moderatorId: moderator.id,
-            disabled,
+            disable,
             closed,
           })
           return decisionRelationshipTransactionResponse.records.map(record => ({
diff --git a/backend/src/schema/resolvers/moderation.spec.js b/backend/src/schema/resolvers/moderation.spec.js
index 242a8c3fa..e29aa0ffd 100644
--- a/backend/src/schema/resolvers/moderation.spec.js
+++ b/backend/src/schema/resolvers/moderation.spec.js
@@ -8,11 +8,18 @@ const factory = Factory()
 const neode = getNeode()
 const driver = getDriver()
 
-let query, mutate, authenticatedUser, variables, moderator, nonModerator
+let query,
+  mutate,
+  authenticatedUser,
+  disableVariables,
+  // enableVariables,
+  resourceVariables,
+  moderator,
+  nonModerator
 
-const disableMutation = gql`
-  mutation($id: ID!) {
-    decide(resourceId: $id, disabled: true, closed: false) {
+const decideMutation = gql`
+  mutation($resourceId: ID!, $disable: Boolean, $closed: Boolean) {
+    decide(resourceId: $resourceId, disable: $disable, closed: $closed) {
       post {
         id
       }
@@ -69,7 +76,19 @@ describe('moderate resources', () => {
   })
 
   beforeEach(async () => {
-    variables = {}
+    resourceVariables = {
+      id: 'undefined-resource',
+    }
+    disableVariables = {
+      resourceId: 'undefined-resource',
+      disable: true,
+      closed: false,
+    }
+    // enableVariables = {
+    //   resourceId: 'undefined-resource',
+    //   disable: false,
+    //   closed: false,
+    // }
     authenticatedUser = null
     moderator = await factory.create('User', {
       id: 'moderator-id',
@@ -84,19 +103,17 @@ describe('moderate resources', () => {
     await factory.cleanDatabase()
   })
 
-  describe('disable', () => {
-    beforeEach(() => {
-      variables = {
-        id: 'some-resource',
-      }
-    })
+  describe('decide to disable', () => {
     describe('unauthenticated', () => {
       it('throws authorization error', async () => {
-        await expect(mutate({ mutation: disableMutation, variables })).resolves.toMatchObject({
+        await expect(
+          mutate({ mutation: decideMutation, variables: disableVariables }),
+        ).resolves.toMatchObject({
           errors: [{ message: 'Not Authorised!' }],
         })
       })
     })
+
     describe('authenticated', () => {
       describe('non moderator', () => {
         beforeEach(async () => {
@@ -108,8 +125,11 @@ describe('moderate resources', () => {
           })
           authenticatedUser = await nonModerator.toJson()
         })
+
         it('throws authorization error', async () => {
-          await expect(mutate({ mutation: disableMutation, variables })).resolves.toMatchObject({
+          await expect(
+            mutate({ mutation: decideMutation, variables: disableVariables }),
+          ).resolves.toMatchObject({
             errors: [{ message: 'Not Authorised!' }],
           })
         })
@@ -122,14 +142,17 @@ describe('moderate resources', () => {
 
         describe('moderate a resource that is not a (Comment|Post|User) ', () => {
           beforeEach(async () => {
-            variables = {
-              id: 'sample-tag-id',
+            disableVariables = {
+              ...disableVariables,
+              resourceId: 'sample-tag-id',
             }
             await factory.create('Tag', { id: 'sample-tag-id' })
           })
 
           it('returns null', async () => {
-            await expect(mutate({ mutation: disableMutation, variables })).resolves.toMatchObject({
+            await expect(
+              mutate({ mutation: decideMutation, variables: disableVariables }),
+            ).resolves.toMatchObject({
               data: { decide: null },
             })
           })
@@ -137,63 +160,102 @@ describe('moderate resources', () => {
 
         describe('moderate a comment', () => {
           beforeEach(async () => {
-            variables = {}
+            // Wolle variables = {}
             await factory.create('Comment', {
               id: 'comment-id',
             })
           })
 
           it('returns disabled resource id', async () => {
-            variables = { id: 'comment-id' }
-            await expect(mutate({ mutation: disableMutation, variables })).resolves.toMatchObject({
+            disableVariables = {
+              ...disableVariables,
+              resourceId: 'comment-id',
+            }
+            await expect(
+              mutate({ mutation: decideMutation, variables: disableVariables }),
+            ).resolves.toMatchObject({
               data: { decide: { comment: { id: 'comment-id' } } },
               errors: undefined,
             })
           })
 
           it('changes .decidedByModerator', async () => {
-            variables = { id: 'comment-id' }
+            resourceVariables = {
+              id: 'comment-id',
+            }
+            disableVariables = {
+              ...disableVariables,
+              resourceId: 'comment-id',
+            }
             const before = { data: { Comment: [{ id: 'comment-id', decidedByModerator: null }] } }
             const expected = {
               data: { Comment: [{ id: 'comment-id', decidedByModerator: { id: 'moderator-id' } }] },
             }
-            await expect(query({ query: commentQuery, variables })).resolves.toMatchObject(before)
-            await expect(mutate({ mutation: disableMutation, variables })).resolves.toMatchObject({
+            await expect(
+              query({ query: commentQuery, variables: resourceVariables }),
+            ).resolves.toMatchObject(before)
+            await expect(
+              mutate({ mutation: decideMutation, variables: disableVariables }),
+            ).resolves.toMatchObject({
               data: { decide: { comment: { id: 'comment-id' } } },
             })
-            await expect(query({ query: commentQuery, variables })).resolves.toMatchObject(expected)
+            await expect(
+              query({ query: commentQuery, variables: resourceVariables }),
+            ).resolves.toMatchObject(expected)
           })
 
           it('updates .disabled on comment', async () => {
-            variables = { id: 'comment-id' }
+            resourceVariables = {
+              id: 'comment-id',
+            }
+            disableVariables = {
+              ...disableVariables,
+              resourceId: 'comment-id',
+            }
             const before = { data: { Comment: [{ id: 'comment-id', disabled: false }] } }
             const expected = { data: { Comment: [{ id: 'comment-id', disabled: true }] } }
 
-            await expect(query({ query: commentQuery, variables })).resolves.toMatchObject(before)
-            await expect(mutate({ mutation: disableMutation, variables })).resolves.toMatchObject({
+            await expect(
+              query({ query: commentQuery, variables: resourceVariables }),
+            ).resolves.toMatchObject(before)
+            await expect(
+              mutate({ mutation: decideMutation, variables: disableVariables }),
+            ).resolves.toMatchObject({
               data: { decide: { comment: { id: 'comment-id' } } },
             })
-            await expect(query({ query: commentQuery, variables })).resolves.toMatchObject(expected)
+            await expect(
+              query({ query: commentQuery, variables: resourceVariables }),
+            ).resolves.toMatchObject(expected)
           })
         })
 
         describe('moderate a post', () => {
           beforeEach(async () => {
-            variables = {}
             await factory.create('Post', {
               id: 'sample-post-id',
             })
           })
 
           it('returns disabled resource id', async () => {
-            variables = { id: 'sample-post-id' }
-            await expect(mutate({ mutation: disableMutation, variables })).resolves.toMatchObject({
+            disableVariables = {
+              ...disableVariables,
+              resourceId: 'sample-post-id',
+            }
+            await expect(
+              mutate({ mutation: decideMutation, variables: disableVariables }),
+            ).resolves.toMatchObject({
               data: { decide: { post: { id: 'sample-post-id' } } },
             })
           })
 
           it('changes .decidedByModerator', async () => {
-            variables = { id: 'sample-post-id' }
+            resourceVariables = {
+              id: 'sample-post-id',
+            }
+            disableVariables = {
+              ...disableVariables,
+              resourceId: 'sample-post-id',
+            }
             const before = { data: { Post: [{ id: 'sample-post-id', decidedByModerator: null }] } }
             const expected = {
               data: {
@@ -201,23 +263,41 @@ describe('moderate resources', () => {
               },
             }
 
-            await expect(query({ query: postQuery, variables })).resolves.toMatchObject(before)
-            await expect(mutate({ mutation: disableMutation, variables })).resolves.toMatchObject({
+            await expect(
+              query({ query: postQuery, variables: resourceVariables }),
+            ).resolves.toMatchObject(before)
+            await expect(
+              mutate({ mutation: decideMutation, variables: disableVariables }),
+            ).resolves.toMatchObject({
               data: { decide: { post: { id: 'sample-post-id' } } },
             })
-            await expect(query({ query: postQuery, variables })).resolves.toMatchObject(expected)
+            await expect(
+              query({ query: postQuery, variables: resourceVariables }),
+            ).resolves.toMatchObject(expected)
           })
 
           it('updates .disabled on post', async () => {
+            resourceVariables = {
+              id: 'sample-post-id',
+            }
+            disableVariables = {
+              ...disableVariables,
+              resourceId: 'sample-post-id',
+            }
             const before = { data: { Post: [{ id: 'sample-post-id', disabled: false }] } }
             const expected = { data: { Post: [{ id: 'sample-post-id', disabled: true }] } }
-            variables = { id: 'sample-post-id' }
 
-            await expect(query({ query: postQuery, variables })).resolves.toMatchObject(before)
-            await expect(mutate({ mutation: disableMutation, variables })).resolves.toMatchObject({
+            await expect(
+              query({ query: postQuery, variables: resourceVariables }),
+            ).resolves.toMatchObject(before)
+            await expect(
+              mutate({ mutation: decideMutation, variables: disableVariables }),
+            ).resolves.toMatchObject({
               data: { decide: { post: { id: 'sample-post-id' } } },
             })
-            await expect(query({ query: postQuery, variables })).resolves.toMatchObject(expected)
+            await expect(
+              query({ query: postQuery, variables: resourceVariables }),
+            ).resolves.toMatchObject(expected)
           })
         })
       })
@@ -227,8 +307,10 @@ describe('moderate resources', () => {
   describe('enable', () => {
     describe('unautenticated user', () => {
       it('throws authorization error', async () => {
-        variables = { id: 'sample-post-id' }
-        await expect(mutate({ mutation: enableMutation, variables })).resolves.toMatchObject({
+        resourceVariables = { id: 'sample-post-id' }
+        await expect(
+          mutate({ mutation: enableMutation, variables: resourceVariables }),
+        ).resolves.toMatchObject({
           errors: [{ message: 'Not Authorised!' }],
         })
       })
@@ -245,9 +327,12 @@ describe('moderate resources', () => {
           })
           authenticatedUser = await nonModerator.toJson()
         })
+
         it('throws authorization error', async () => {
-          variables = { id: 'sample-post-id' }
-          await expect(mutate({ mutation: enableMutation, variables })).resolves.toMatchObject({
+          resourceVariables = { id: 'sample-post-id' }
+          await expect(
+            mutate({ mutation: enableMutation, variables: resourceVariables }),
+          ).resolves.toMatchObject({
             errors: [{ message: 'Not Authorised!' }],
           })
         })
@@ -257,6 +342,7 @@ describe('moderate resources', () => {
         beforeEach(async () => {
           authenticatedUser = await moderator.toJson()
         })
+
         describe('moderate a resource that is not a (Comment|Post|User) ', () => {
           beforeEach(async () => {
             await Promise.all([factory.create('Tag', { id: 'sample-tag-id' })])
@@ -273,15 +359,23 @@ describe('moderate resources', () => {
 
         describe('moderate a comment', () => {
           beforeEach(async () => {
-            variables = { id: 'comment-id' }
+            disableVariables = {
+              ...disableVariables,
+              resourceId: 'comment-id',
+            }
+            resourceVariables = {
+              id: 'comment-id',
+            }
             await factory.create('Comment', {
               id: 'comment-id',
             })
-            await mutate({ mutation: disableMutation, variables })
+            await mutate({ mutation: decideMutation, variables: disableVariables })
           })
 
           it('returns enabled resource id', async () => {
-            await expect(mutate({ mutation: enableMutation, variables })).resolves.toMatchObject({
+            await expect(
+              mutate({ mutation: enableMutation, variables: resourceVariables }),
+            ).resolves.toMatchObject({
               data: { enable: 'comment-id' },
               errors: undefined,
             })
@@ -292,11 +386,15 @@ describe('moderate resources', () => {
               data: { Comment: [{ id: 'comment-id', decidedByModerator: { id: 'moderator-id' } }] },
               errors: undefined,
             }
-            await expect(mutate({ mutation: enableMutation, variables })).resolves.toMatchObject({
+            await expect(
+              mutate({ mutation: enableMutation, variables: resourceVariables }),
+            ).resolves.toMatchObject({
               data: { enable: 'comment-id' },
               errors: undefined,
             })
-            await expect(query({ query: commentQuery, variables })).resolves.toMatchObject(expected)
+            await expect(
+              query({ query: commentQuery, variables: resourceVariables }),
+            ).resolves.toMatchObject(expected)
           })
 
           it('updates .disabled on comment', async () => {
@@ -305,25 +403,36 @@ describe('moderate resources', () => {
               errors: undefined,
             }
 
-            await expect(mutate({ mutation: enableMutation, variables })).resolves.toMatchObject({
+            await expect(
+              mutate({ mutation: enableMutation, variables: resourceVariables }),
+            ).resolves.toMatchObject({
               data: { enable: 'comment-id' },
               errors: undefined,
             })
-            await expect(query({ query: commentQuery, variables })).resolves.toMatchObject(expected)
+            await expect(
+              query({ query: commentQuery, variables: resourceVariables }),
+            ).resolves.toMatchObject(expected)
           })
         })
 
         describe('moderate a post', () => {
           beforeEach(async () => {
-            variables = { id: 'post-id' }
+            resourceVariables = { id: 'post-id' }
+            disableVariables = {
+              ...disableVariables,
+              resourceId: 'post-id',
+            }
+            resourceVariables = {
+              id: 'post-id',
+            }
             await factory.create('Post', {
               id: 'post-id',
             })
-            await mutate({ mutation: disableMutation, variables })
+            await mutate({ mutation: decideMutation, variables: disableVariables })
           })
 
           it('returns enabled resource id', async () => {
-            await expect(mutate({ mutation: enableMutation, variables })).resolves.toMatchObject({
+            await expect(mutate({ mutation: enableMutation, variables: resourceVariables })).resolves.toMatchObject({
               data: { enable: 'post-id' },
               errors: undefined,
             })
@@ -334,11 +443,11 @@ describe('moderate resources', () => {
               data: { Post: [{ id: 'post-id', decidedByModerator: { id: 'moderator-id' } }] },
               errors: undefined,
             }
-            await expect(mutate({ mutation: enableMutation, variables })).resolves.toMatchObject({
+            await expect(mutate({ mutation: enableMutation, variables: resourceVariables })).resolves.toMatchObject({
               data: { enable: 'post-id' },
               errors: undefined,
             })
-            await expect(query({ query: postQuery, variables })).resolves.toMatchObject(expected)
+            await expect(query({ query: postQuery, variables: resourceVariables })).resolves.toMatchObject(expected)
           })
 
           it('updates .disabled on post', async () => {
@@ -347,11 +456,11 @@ describe('moderate resources', () => {
               errors: undefined,
             }
 
-            await expect(mutate({ mutation: enableMutation, variables })).resolves.toMatchObject({
+            await expect(mutate({ mutation: enableMutation, variables: resourceVariables })).resolves.toMatchObject({
               data: { enable: 'post-id' },
               errors: undefined,
             })
-            await expect(query({ query: postQuery, variables })).resolves.toMatchObject(expected)
+            await expect(query({ query: postQuery, variables: resourceVariables })).resolves.toMatchObject(expected)
           })
         })
       })
diff --git a/backend/src/schema/types/type/DECIDED.gql b/backend/src/schema/types/type/DECIDED.gql
index 073730403..d76534256 100644
--- a/backend/src/schema/types/type/DECIDED.gql
+++ b/backend/src/schema/types/type/DECIDED.gql
@@ -3,7 +3,7 @@ type DECIDED {
   updatedAt: String
   # reasonCategory: ReasonCategory
   # reasonDescription: String
-  disabled: Boolean!
+  disable: Boolean!
   closed: Boolean!
 
   # internal
@@ -22,5 +22,5 @@ type DECIDED {
 }
 
 type Mutation {
-  decide(resourceId: ID!, disabled: Boolean, closed: Boolean): DECIDED
+  decide(resourceId: ID!, disable: Boolean, closed: Boolean): DECIDED
 }
diff --git a/neo4j/change_disabled_relationship_to_decided_relationship.sh b/neo4j/change_disabled_relationship_to_decided_relationship.sh
index baa147bcc..8fb3ac4b2 100755
--- a/neo4j/change_disabled_relationship_to_decided_relationship.sh
+++ b/neo4j/change_disabled_relationship_to_decided_relationship.sh
@@ -19,6 +19,6 @@ echo "
 MATCH (moderator:User)-[disabled:DISABLED]->(resource)
 DELETE disabled
 CREATE (moderator)-[decision:DECIDED]->(resource)
-SET decision.createdAt = toString(datetime()), decision.disabled = true, decision.last = true, decision.closed = false
+SET decision.createdAt = toString(datetime()), decision.disable = true, decision.last = true, decision.closed = false
 RETURN decision;
 " | cypher-shell

From 96bc8555182903a9b3455294c2e62ba0451b2c62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Mon, 4 Nov 2019 19:13:15 +0100
Subject: [PATCH 015/174] Get the backend tests with `decide` mutation to work
 #2

---
 backend/src/schema/resolvers/moderation.js    |   3 +-
 .../src/schema/resolvers/moderation.spec.js   | 103 ++++++++++--------
 2 files changed, 57 insertions(+), 49 deletions(-)

diff --git a/backend/src/schema/resolvers/moderation.js b/backend/src/schema/resolvers/moderation.js
index 072bbb700..f52bdef33 100644
--- a/backend/src/schema/resolvers/moderation.js
+++ b/backend/src/schema/resolvers/moderation.js
@@ -96,8 +96,7 @@ export default {
             `
         } else {
           // an open decision …
-          if (disable === undefined)
-            disable = existingDecisionTxResult.decision.properties.disable // default set to existing
+          if (disable === undefined) disable = existingDecisionTxResult.decision.properties.disable // default set to existing
           if (closed === undefined) closed = existingDecisionTxResult.decision.properties.closed // default set to existing
           // current moderator is not the same as old
           if (moderator.id !== existingDecisionTxResult.decisionModerator.id) {
diff --git a/backend/src/schema/resolvers/moderation.spec.js b/backend/src/schema/resolvers/moderation.spec.js
index e29aa0ffd..31014224e 100644
--- a/backend/src/schema/resolvers/moderation.spec.js
+++ b/backend/src/schema/resolvers/moderation.spec.js
@@ -12,7 +12,7 @@ let query,
   mutate,
   authenticatedUser,
   disableVariables,
-  // enableVariables,
+  enableVariables,
   resourceVariables,
   moderator,
   nonModerator
@@ -29,12 +29,6 @@ const decideMutation = gql`
     }
   }
 `
-const enableMutation = gql`
-  mutation($id: ID!) {
-    enable(id: $id)
-  }
-`
-
 const commentQuery = gql`
   query($id: ID!) {
     Comment(id: $id) {
@@ -46,7 +40,6 @@ const commentQuery = gql`
     }
   }
 `
-
 const postQuery = gql`
   query($id: ID) {
     Post(id: $id) {
@@ -84,11 +77,11 @@ describe('moderate resources', () => {
       disable: true,
       closed: false,
     }
-    // enableVariables = {
-    //   resourceId: 'undefined-resource',
-    //   disable: false,
-    //   closed: false,
-    // }
+    enableVariables = {
+      resourceId: 'undefined-resource',
+      disable: false,
+      closed: false,
+    }
     authenticatedUser = null
     moderator = await factory.create('User', {
       id: 'moderator-id',
@@ -307,9 +300,12 @@ describe('moderate resources', () => {
   describe('enable', () => {
     describe('unautenticated user', () => {
       it('throws authorization error', async () => {
-        resourceVariables = { id: 'sample-post-id' }
+        enableVariables = {
+          ...enableVariables,
+          resourceId: 'sample-post-id',
+        }
         await expect(
-          mutate({ mutation: enableMutation, variables: resourceVariables }),
+          mutate({ mutation: decideMutation, variables: enableVariables }),
         ).resolves.toMatchObject({
           errors: [{ message: 'Not Authorised!' }],
         })
@@ -329,9 +325,12 @@ describe('moderate resources', () => {
         })
 
         it('throws authorization error', async () => {
-          resourceVariables = { id: 'sample-post-id' }
+          enableVariables = {
+            ...enableVariables,
+            resourceId: 'sample-post-id',
+          }
           await expect(
-            mutate({ mutation: enableMutation, variables: resourceVariables }),
+            mutate({ mutation: decideMutation, variables: enableVariables }),
           ).resolves.toMatchObject({
             errors: [{ message: 'Not Authorised!' }],
           })
@@ -349,22 +348,30 @@ describe('moderate resources', () => {
           })
 
           it('returns null', async () => {
+            enableVariables = {
+              ...enableVariables,
+              resourceId: 'sample-tag-id',
+            }
             await expect(
-              mutate({ mutation: enableMutation, variables: { id: 'sample-tag-id' } }),
+              mutate({ mutation: decideMutation, variables: enableVariables }),
             ).resolves.toMatchObject({
-              data: { enable: null },
+              data: { decide: null },
             })
           })
         })
 
         describe('moderate a comment', () => {
           beforeEach(async () => {
+            resourceVariables = {
+              id: 'comment-id',
+            }
             disableVariables = {
               ...disableVariables,
               resourceId: 'comment-id',
             }
-            resourceVariables = {
-              id: 'comment-id',
+            enableVariables = {
+              ...enableVariables,
+              resourceId: 'comment-id',
             }
             await factory.create('Comment', {
               id: 'comment-id',
@@ -374,23 +381,21 @@ describe('moderate resources', () => {
 
           it('returns enabled resource id', async () => {
             await expect(
-              mutate({ mutation: enableMutation, variables: resourceVariables }),
+              mutate({ mutation: decideMutation, variables: enableVariables }),
             ).resolves.toMatchObject({
-              data: { enable: 'comment-id' },
-              errors: undefined,
+              data: { decide: { comment: { id: 'comment-id' } } },
             })
           })
 
           it('changes .decidedByModerator', async () => {
             const expected = {
               data: { Comment: [{ id: 'comment-id', decidedByModerator: { id: 'moderator-id' } }] },
-              errors: undefined,
             }
+
             await expect(
-              mutate({ mutation: enableMutation, variables: resourceVariables }),
+              mutate({ mutation: decideMutation, variables: enableVariables }),
             ).resolves.toMatchObject({
-              data: { enable: 'comment-id' },
-              errors: undefined,
+              data: { decide: { comment: { id: 'comment-id' } } },
             })
             await expect(
               query({ query: commentQuery, variables: resourceVariables }),
@@ -400,14 +405,12 @@ describe('moderate resources', () => {
           it('updates .disabled on comment', async () => {
             const expected = {
               data: { Comment: [{ id: 'comment-id', disabled: false }] },
-              errors: undefined,
             }
 
             await expect(
-              mutate({ mutation: enableMutation, variables: resourceVariables }),
+              mutate({ mutation: decideMutation, variables: enableVariables }),
             ).resolves.toMatchObject({
-              data: { enable: 'comment-id' },
-              errors: undefined,
+              data: { decide: { comment: { id: 'comment-id' } } },
             })
             await expect(
               query({ query: commentQuery, variables: resourceVariables }),
@@ -422,8 +425,9 @@ describe('moderate resources', () => {
               ...disableVariables,
               resourceId: 'post-id',
             }
-            resourceVariables = {
-              id: 'post-id',
+            enableVariables = {
+              ...enableVariables,
+              resourceId: 'post-id',
             }
             await factory.create('Post', {
               id: 'post-id',
@@ -432,35 +436,40 @@ describe('moderate resources', () => {
           })
 
           it('returns enabled resource id', async () => {
-            await expect(mutate({ mutation: enableMutation, variables: resourceVariables })).resolves.toMatchObject({
-              data: { enable: 'post-id' },
-              errors: undefined,
+            await expect(
+              mutate({ mutation: decideMutation, variables: enableVariables }),
+            ).resolves.toMatchObject({
+              data: { decide: { post: { id: 'post-id' } } },
             })
           })
 
           it('changes .decidedByModerator', async () => {
             const expected = {
               data: { Post: [{ id: 'post-id', decidedByModerator: { id: 'moderator-id' } }] },
-              errors: undefined,
             }
-            await expect(mutate({ mutation: enableMutation, variables: resourceVariables })).resolves.toMatchObject({
-              data: { enable: 'post-id' },
-              errors: undefined,
+            await expect(
+              mutate({ mutation: decideMutation, variables: enableVariables }),
+            ).resolves.toMatchObject({
+              data: { decide: { post: { id: 'post-id' } } },
             })
-            await expect(query({ query: postQuery, variables: resourceVariables })).resolves.toMatchObject(expected)
+            await expect(
+              query({ query: postQuery, variables: resourceVariables }),
+            ).resolves.toMatchObject(expected)
           })
 
           it('updates .disabled on post', async () => {
             const expected = {
               data: { Post: [{ id: 'post-id', disabled: false }] },
-              errors: undefined,
             }
 
-            await expect(mutate({ mutation: enableMutation, variables: resourceVariables })).resolves.toMatchObject({
-              data: { enable: 'post-id' },
-              errors: undefined,
+            await expect(
+              mutate({ mutation: decideMutation, variables: enableVariables }),
+            ).resolves.toMatchObject({
+              data: { decide: { post: { id: 'post-id' } } },
             })
-            await expect(query({ query: postQuery, variables: resourceVariables })).resolves.toMatchObject(expected)
+            await expect(
+              query({ query: postQuery, variables: resourceVariables }),
+            ).resolves.toMatchObject(expected)
           })
         })
       })

From a4521b4621a872e0f717b185894fba683a46208e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Wed, 6 Nov 2019 09:13:08 +0100
Subject: [PATCH 016/174] Use of mutation `disable` removed

- The mutation definition still has to be removed.
---
 .../softDelete/softDeleteMiddleware.spec.js   | 19 +++--
 .../schema/resolvers/user_management.spec.js  |  8 +-
 backend/src/seed/seed-db.js                   | 73 +++++++++++++------
 webapp/components/Modal/DisableModal.vue      |  8 +-
 4 files changed, 73 insertions(+), 35 deletions(-)

diff --git a/backend/src/middleware/softDelete/softDeleteMiddleware.spec.js b/backend/src/middleware/softDelete/softDeleteMiddleware.spec.js
index 5b04abebd..f656b6e05 100644
--- a/backend/src/middleware/softDelete/softDeleteMiddleware.spec.js
+++ b/backend/src/middleware/softDelete/softDeleteMiddleware.spec.js
@@ -111,15 +111,22 @@ beforeAll(async () => {
   mutate = client.mutate
 
   authenticatedUser = await moderator.toJson()
-  const disableMutation = gql`
-    mutation($id: ID!) {
-      disable(id: $id)
+  const decideMutation = gql`
+    mutation($resourceId: ID!, $disable: Boolean, $closed: Boolean) {
+      decide(resourceId: $resourceId, disable: $disable, closed: $closed) {
+        disable
+      }
     }
   `
+  const disableVariables = {
+    resourceId: 'undefined-resource',
+    disable: true,
+    closed: false,
+  }
   await Promise.all([
-    mutate({ mutation: disableMutation, variables: { id: 'c1' } }),
-    mutate({ mutation: disableMutation, variables: { id: 'u2' } }),
-    mutate({ mutation: disableMutation, variables: { id: 'p2' } }),
+    mutate({ mutation: decideMutation, variables: { ...disableVariables, resourceId: 'c1' } }),
+    mutate({ mutation: decideMutation, variables: { ...disableVariables, resourceId: 'u2' } }),
+    mutate({ mutation: decideMutation, variables: { ...disableVariables, resourceId: 'p2' } }),
   ])
   authenticatedUser = null
 })
diff --git a/backend/src/schema/resolvers/user_management.spec.js b/backend/src/schema/resolvers/user_management.spec.js
index 4fe21f92a..8f0c33572 100644
--- a/backend/src/schema/resolvers/user_management.spec.js
+++ b/backend/src/schema/resolvers/user_management.spec.js
@@ -19,11 +19,13 @@ const disable = async id => {
   req = { headers: { authorization: `Bearer ${moderatorBearerToken}` } }
   await mutate({
     mutation: gql`
-      mutation($id: ID!) {
-        disable(id: $id)
+      mutation($resourceId: ID!, $disable: Boolean, $closed: Boolean) {
+        decide(resourceId: $resourceId, disable: $disable, closed: $closed) {
+          disable
+        }
       }
     `,
-    variables: { id },
+    variables: { resourceId: id, disable: true, closed: false },
   })
   req = { headers: {} }
 }
diff --git a/backend/src/seed/seed-db.js b/backend/src/seed/seed-db.js
index f6c2aee7d..9b5b400ab 100644
--- a/backend/src/seed/seed-db.js
+++ b/backend/src/seed/seed-db.js
@@ -536,7 +536,7 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
         postId: 'p3',
       }),
       factory.create('Comment', {
-        author: bobDerBaumeister,
+        author: jennyRostock,
         id: 'c5',
         postId: 'p3',
       }),
@@ -639,28 +639,6 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
       louie.relateTo(p10, 'shouted'),
     ])
 
-    const disableMutation = gql`
-      mutation($id: ID!) {
-        disable(id: $id)
-      }
-    `
-    authenticatedUser = await bobDerBaumeister.toJson()
-    await Promise.all([
-      mutate({
-        mutation: disableMutation,
-        variables: {
-          id: 'p11',
-        },
-      }),
-      mutate({
-        mutation: disableMutation,
-        variables: {
-          id: 'c5',
-        },
-      }),
-    ])
-    authenticatedUser = null
-
     // There is no error logged or the 'try' fails if this mutation is wrong. Why?
     const reportMutation = gql`
       mutation($resourceId: ID!, $reasonCategory: ReasonCategory!, $reasonDescription: String!) {
@@ -675,6 +653,22 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
     `
     authenticatedUser = await huey.toJson()
     await Promise.all([
+      mutate({
+        mutation: reportMutation,
+        variables: {
+          resourceId: 'p11',
+          reasonCategory: 'discrimination_etc',
+          reasonDescription: 'I am what I am !!!',
+        },
+      }),
+      mutate({
+        mutation: reportMutation,
+        variables: {
+          resourceId: 'c5',
+          reasonCategory: 'doxing',
+          reasonDescription: "This shouldn't be shown to anybody else! It's my privat thing!",
+        },
+      }),
       mutate({
         mutation: reportMutation,
         variables: {
@@ -730,6 +724,39 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
     ])
     authenticatedUser = null
 
+    // only decide after report !!!
+    const decideMutation = gql`
+      mutation($resourceId: ID!, $disable: Boolean, $closed: Boolean) {
+        decide(resourceId: $resourceId, disable: $disable, closed: $closed) {
+          disable
+        }
+      }
+    `
+    const disableVariables = {
+      resourceId: 'undefined-resource',
+      disable: true,
+      closed: false,
+    }
+    authenticatedUser = await bobDerBaumeister.toJson()
+    await Promise.all([
+      mutate({
+        mutation: decideMutation,
+        variables: {
+          ...disableVariables,
+          resourceId: 'p11',
+        },
+      }),
+      mutate({
+        mutation: decideMutation,
+        variables: {
+          ...disableVariables,
+          resourceId: 'c5',
+          closed: true,
+        },
+      }),
+    ])
+    authenticatedUser = null
+
     await Promise.all(
       [...Array(30).keys()].map(i => {
         return factory.create('User')
diff --git a/webapp/components/Modal/DisableModal.vue b/webapp/components/Modal/DisableModal.vue
index 1e778ec68..a231b4e2b 100644
--- a/webapp/components/Modal/DisableModal.vue
+++ b/webapp/components/Modal/DisableModal.vue
@@ -54,11 +54,13 @@ export default {
         // await this.modalData.buttons.confirm.callback()
         await this.$apollo.mutate({
           mutation: gql`
-            mutation($id: ID!) {
-              disable(id: $id)
+            mutation($resourceId: ID!, $disable: Boolean, $closed: Boolean) {
+              decide(resourceId: $resourceId, disable: $disable, closed: $closed) {
+                disable
+              }
             }
           `,
-          variables: { id: this.id },
+          variables: { resourceId: this.id, disable: true, closed: false },
         })
         this.$toast.success(this.$t('disable.success'))
         this.isOpen = false

From d4e7e10f8c4c180ca9171405ed47acba161497dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Wed, 6 Nov 2019 14:34:24 +0100
Subject: [PATCH 017/174] Use of mutation `enable` removed, fix fronend tests

- The mutation definition still has to be removed.
---
 webapp/components/Modal/DisableModal.spec.js        | 12 ++++++------
 webapp/components/ReleaseModal/ReleaseModal.spec.js | 10 ++++++----
 webapp/components/ReleaseModal/ReleaseModal.vue     |  8 +++++---
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/webapp/components/Modal/DisableModal.spec.js b/webapp/components/Modal/DisableModal.spec.js
index b5ebf888c..25e3e9e04 100644
--- a/webapp/components/Modal/DisableModal.spec.js
+++ b/webapp/components/Modal/DisableModal.spec.js
@@ -29,9 +29,7 @@ describe('DisableModal.vue', () => {
       $apollo: {
         mutate: jest
           .fn()
-          .mockResolvedValueOnce({
-            enable: 'u4711',
-          })
+          .mockResolvedValueOnce()
           .mockRejectedValue({
             message: 'Not Authorised!',
           }),
@@ -162,11 +160,13 @@ describe('DisableModal.vue', () => {
           expect(mocks.$apollo.mutate).toHaveBeenCalled()
         })
 
-        it('passes id to mutation', () => {
+        it('passes parameters to mutation', () => {
           const calls = mocks.$apollo.mutate.mock.calls
           const [[{ variables }]] = calls
-          expect(variables).toEqual({
-            id: 'u4711',
+          expect(variables).toMatchObject({
+            resourceId: 'u4711',
+            disable: true,
+            closed: false,
           })
         })
 
diff --git a/webapp/components/ReleaseModal/ReleaseModal.spec.js b/webapp/components/ReleaseModal/ReleaseModal.spec.js
index bb7281ab7..a2ff013d8 100644
--- a/webapp/components/ReleaseModal/ReleaseModal.spec.js
+++ b/webapp/components/ReleaseModal/ReleaseModal.spec.js
@@ -30,7 +30,7 @@ describe('ReleaseModal.vue', () => {
       $apollo: {
         mutate: jest
           .fn()
-          .mockResolvedValueOnce({ enable: 'u4711' })
+          .mockResolvedValueOnce()
           .mockRejectedValue({ message: 'Not Authorised!' }),
       },
       location: {
@@ -157,11 +157,13 @@ describe('ReleaseModal.vue', () => {
           expect(mocks.$apollo.mutate).toHaveBeenCalled()
         })
 
-        it('passes id to mutation', () => {
+        it('passes parameters to mutation', () => {
           const calls = mocks.$apollo.mutate.mock.calls
           const [[{ variables }]] = calls
-          expect(variables).toEqual({
-            id: 'u4711',
+          expect(variables).toMatchObject({
+            resourceId: 'u4711',
+            disable: false,
+            closed: false,
           })
         })
 
diff --git a/webapp/components/ReleaseModal/ReleaseModal.vue b/webapp/components/ReleaseModal/ReleaseModal.vue
index dace3d665..f098dd2c4 100644
--- a/webapp/components/ReleaseModal/ReleaseModal.vue
+++ b/webapp/components/ReleaseModal/ReleaseModal.vue
@@ -53,11 +53,13 @@ export default {
         // await this.modalData.buttons.confirm.callback()
         await this.$apollo.mutate({
           mutation: gql`
-            mutation($id: ID!) {
-              enable(id: $id)
+            mutation($resourceId: ID!, $disable: Boolean, $closed: Boolean) {
+              decide(resourceId: $resourceId, disable: $disable, closed: $closed) {
+                disable
+              }
             }
           `,
-          variables: { id: this.id },
+          variables: { resourceId: this.id, disable: false, closed: false },
         })
         this.$toast.success(this.$t('release.success'))
         this.isOpen = false

From 7d217148d3f97841877bba836b1d5ee7ad0541bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Wed, 6 Nov 2019 14:38:09 +0100
Subject: [PATCH 018/174] Remove definition of mutation `enable`

---
 backend/src/middleware/permissionsMiddleware.js |  1 -
 backend/src/schema/resolvers/moderation.js      | 17 -----------------
 backend/src/schema/types/schema.gql             |  1 -
 3 files changed, 19 deletions(-)

diff --git a/backend/src/middleware/permissionsMiddleware.js b/backend/src/middleware/permissionsMiddleware.js
index c4bea06a3..578a75ea3 100644
--- a/backend/src/middleware/permissionsMiddleware.js
+++ b/backend/src/middleware/permissionsMiddleware.js
@@ -160,7 +160,6 @@ const permissions = shield(
       shout: isAuthenticated,
       unshout: isAuthenticated,
       changePassword: isAuthenticated,
-      enable: isModerator,
       disable: isModerator,
       decide: isModerator,
       CreateComment: isAuthenticated,
diff --git a/backend/src/schema/resolvers/moderation.js b/backend/src/schema/resolvers/moderation.js
index f52bdef33..a50f1df1c 100644
--- a/backend/src/schema/resolvers/moderation.js
+++ b/backend/src/schema/resolvers/moderation.js
@@ -29,23 +29,6 @@ export default {
       if (!resource) return null
       return resource.id
     },
-    enable: async (object, params, { user, driver }) => {
-      const { id: resourceId } = params
-      const cypher = `
-        MATCH (resource {id: $resourceId})<-[decision:DECIDED]-(:User)
-        SET resource.disabled = false
-        SET decision.disable = false, decision.updatedAt = toString(datetime())
-        RETURN resource {.id}
-      `
-      const session = driver.session()
-      const res = await session.run(cypher, { resourceId })
-      session.close()
-      const [resource] = res.records.map(record => {
-        return record.get('resource')
-      })
-      if (!resource) return null
-      return resource.id
-    },
     decide: async (_object, params, context, _resolveInfo) => {
       let createdRelationshipWithNestedAttributes = null
       // Wolle console.log('params: ', params)
diff --git a/backend/src/schema/types/schema.gql b/backend/src/schema/types/schema.gql
index 27fd2206c..a0a4b4bfc 100644
--- a/backend/src/schema/types/schema.gql
+++ b/backend/src/schema/types/schema.gql
@@ -25,7 +25,6 @@ type Mutation {
   requestPasswordReset(email: String!): Boolean!
   resetPassword(email: String!, nonce: String!, newPassword: String!): Boolean!
   disable(id: ID!): ID
-  enable(id: ID!): ID
   # Shout the given Type and ID
   shout(id: ID!, type: ShoutTypeEnum): Boolean!
   # Unshout the given Type and ID

From 35b802bf82b9949ed98846df5e21422a6592ca2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Wed, 6 Nov 2019 15:18:24 +0100
Subject: [PATCH 019/174] Remove definition of mutation `disable`

---
 .../src/middleware/permissionsMiddleware.js   |  1 -
 backend/src/schema/resolvers/moderation.js    | 29 -------------------
 backend/src/schema/types/schema.gql           |  1 -
 3 files changed, 31 deletions(-)

diff --git a/backend/src/middleware/permissionsMiddleware.js b/backend/src/middleware/permissionsMiddleware.js
index 578a75ea3..ea09e6a80 100644
--- a/backend/src/middleware/permissionsMiddleware.js
+++ b/backend/src/middleware/permissionsMiddleware.js
@@ -160,7 +160,6 @@ const permissions = shield(
       shout: isAuthenticated,
       unshout: isAuthenticated,
       changePassword: isAuthenticated,
-      disable: isModerator,
       decide: isModerator,
       CreateComment: isAuthenticated,
       UpdateComment: isAuthor,
diff --git a/backend/src/schema/resolvers/moderation.js b/backend/src/schema/resolvers/moderation.js
index a50f1df1c..fa0bb9ffe 100644
--- a/backend/src/schema/resolvers/moderation.js
+++ b/backend/src/schema/resolvers/moderation.js
@@ -1,34 +1,5 @@
 export default {
   Mutation: {
-    disable: async (object, params, { user, driver }) => {
-      const { id: resourceId } = params
-      const { id: userId } = user
-      const cypher = `
-        MATCH (u:User {id: $userId})
-        MATCH (resource {id: $resourceId})
-        WHERE resource:User OR resource:Comment OR resource:Post
-        SET resource.disabled = true
-        MERGE (resource)<-[decision:DECIDED]-(u)
-        SET (
-        CASE
-        WHEN decision.createdAt IS NOT NULL
-        THEN decision END).updatedAt = toString(datetime())
-        SET (
-        CASE
-        WHEN decision.createdAt IS NULL
-        THEN decision END).createdAt = toString(datetime())
-        SET decision.disable = true, decision.closed = false, decision.last = true
-        RETURN resource {.id}
-      `
-      const session = driver.session()
-      const res = await session.run(cypher, { resourceId, userId })
-      session.close()
-      const [resource] = res.records.map(record => {
-        return record.get('resource')
-      })
-      if (!resource) return null
-      return resource.id
-    },
     decide: async (_object, params, context, _resolveInfo) => {
       let createdRelationshipWithNestedAttributes = null
       // Wolle console.log('params: ', params)
diff --git a/backend/src/schema/types/schema.gql b/backend/src/schema/types/schema.gql
index a0a4b4bfc..35998b935 100644
--- a/backend/src/schema/types/schema.gql
+++ b/backend/src/schema/types/schema.gql
@@ -24,7 +24,6 @@ type Mutation {
   changePassword(oldPassword: String!, newPassword: String!): String!
   requestPasswordReset(email: String!): Boolean!
   resetPassword(email: String!, nonce: String!, newPassword: String!): Boolean!
-  disable(id: ID!): ID
   # Shout the given Type and ID
   shout(id: ID!, type: ShoutTypeEnum): Boolean!
   # Unshout the given Type and ID

From 465314eda9cd39cab8625fda1e65b4741710d4b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Wed, 6 Nov 2019 17:15:47 +0100
Subject: [PATCH 020/174] Extended decide mutation to close reports on close
 decision, first step

- Give REPORTED a 'closed' and 'decisionUuid' property.
- Give DECIDED a 'uuid' property.
---
 backend/src/schema/resolvers/moderation.js | 59 ++++++++++++++--------
 1 file changed, 37 insertions(+), 22 deletions(-)

diff --git a/backend/src/schema/resolvers/moderation.js b/backend/src/schema/resolvers/moderation.js
index fa0bb9ffe..6f841f018 100644
--- a/backend/src/schema/resolvers/moderation.js
+++ b/backend/src/schema/resolvers/moderation.js
@@ -1,3 +1,5 @@
+import uuid from 'uuid/v4'
+
 export default {
   Mutation: {
     decide: async (_object, params, context, _resolveInfo) => {
@@ -36,17 +38,17 @@ export default {
           if (disable === undefined) disable = false // default for creation
           if (closed === undefined) closed = false // default for creation
           cypherHeader = `
-            MATCH (moderator:User {id: $moderatorId})
-            MATCH (resource {id: $resourceId})
-            WHERE resource:User OR resource:Comment OR resource:Post
-            CREATE (resource)<-[decision:DECIDED]-(moderator)
-            SET decision.last = true
-            WITH decision, resource, moderator
-            OPTIONAL MATCH (:User)-[lastDecision:DECIDED {last: true}]->(resource)
-            SET (
-            CASE
-            WHEN lastDecision IS NOT NULL
-            THEN lastDecision END).last = false
+              MATCH (moderator:User {id: $moderatorId})
+              MATCH (resource {id: $resourceId})
+              WHERE resource:User OR resource:Comment OR resource:Post
+              CREATE (resource)<-[decision:DECIDED]-(moderator)
+              SET decision.last = true
+              WITH decision, resource, moderator
+              OPTIONAL MATCH (:User)-[lastDecision:DECIDED {last: true}]->(resource)
+              SET (
+              CASE
+              WHEN lastDecision IS NOT NULL
+              THEN lastDecision END).last = false
             `
         } else {
           // an open decision …
@@ -56,23 +58,33 @@ export default {
           if (moderator.id !== existingDecisionTxResult.decisionModerator.id) {
             // an open decision from different moderator, then change relation and properties
             cypherHeader = `
-              MATCH (moderator:User)-[oldDecision:DECIDED {closed: false}]->(resource {id: $resourceId})
-              WHERE resource:User OR resource:Comment OR resource:Post
-              DELETE oldDecision
-              MATCH (moderator:User {id: $moderatorId})
-              MATCH (resource {id: $resourceId})
-              WHERE resource:User OR resource:Comment OR resource:Post
-              CREATE (resource)<-[decision:DECIDED]-(moderator)
-              SET decision = oldDecision
+                MATCH (moderator:User)-[oldDecision:DECIDED {closed: false}]->(resource {id: $resourceId})
+                WHERE resource:User OR resource:Comment OR resource:Post
+                DELETE oldDecision
+                MATCH (moderator:User {id: $moderatorId})
+                MATCH (resource {id: $resourceId})
+                WHERE resource:User OR resource:Comment OR resource:Post
+                CREATE (resource)<-[decision:DECIDED]-(moderator)
+                SET decision = oldDecision
               `
           } else {
             // an open decision from same moderator, then change properties
             cypherHeader = `
-              MATCH (moderator:User)-[decision:DECIDED {closed: false}]->(resource {id: $resourceId})
-              WHERE resource:User OR resource:Comment OR resource:Post
+                MATCH (moderator:User)-[decision:DECIDED {closed: false}]->(resource {id: $resourceId})
+                WHERE resource:User OR resource:Comment OR resource:Post
               `
           }
         }
+        let decisionUUID = null
+        let cypherClosed = ''
+        // if (closed) {
+        //   decisionUUID = uuid()
+        //   cypherClosed = `
+        //       OPTIONAL MATCH (:User)-[report:REPORTED {closed: false}]->(resource)
+        //       SET report.closed = true, report.decisionUuid = $decisionUUID
+        //       SET decision.uuid = $decisionUUID
+        //     `
+        // }
         const cypher =
           cypherHeader +
           `SET (
@@ -85,7 +97,9 @@ export default {
             THEN decision END).createdAt = toString(datetime())
             SET decision.disable = $disable, decision.closed = $closed
             SET resource.disabled = $disable
-            RETURN decision, resource, moderator, labels(resource)[0] AS type
+          ` +
+          cypherClosed +
+          `RETURN decision, resource, moderator, labels(resource)[0] AS type
           `
         // Wolle console.log('cypher: ', cypher)
         // console.log('disable: ', disable)
@@ -96,6 +110,7 @@ export default {
             moderatorId: moderator.id,
             disable,
             closed,
+            decisionUUID,
           })
           return decisionRelationshipTransactionResponse.records.map(record => ({
             decision: record.get('decision'),

From 2a23bbf10136248e8bdd7a491a641d9e33a464fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 7 Nov 2019 15:54:26 +0100
Subject: [PATCH 021/174] Refactor frontend and 'reports' query again

---
 backend/src/schema/resolvers/moderation.js    | 47 +++++++++----------
 backend/src/schema/resolvers/reports.js       | 34 ++++++++++++--
 backend/src/schema/resolvers/reports.spec.js  |  1 +
 backend/src/schema/types/type/DECIDED.gql     |  5 +-
 backend/src/schema/types/type/NOTIFIED.gql    |  2 +-
 backend/src/schema/types/type/REPORTED.gql    | 17 +++++--
 backend/src/seed/seed-db.js                   |  8 ++++
 ...ed_relationship_to_decided_relationship.sh |  5 +-
 webapp/graphql/Moderation.js                  |  4 ++
 webapp/locales/de.json                        |  3 +-
 webapp/locales/en.json                        |  3 +-
 webapp/pages/moderation/index.vue             | 28 +++++++++--
 12 files changed, 114 insertions(+), 43 deletions(-)

diff --git a/backend/src/schema/resolvers/moderation.js b/backend/src/schema/resolvers/moderation.js
index 6f841f018..1b6cc4027 100644
--- a/backend/src/schema/resolvers/moderation.js
+++ b/backend/src/schema/resolvers/moderation.js
@@ -1,4 +1,5 @@
 import uuid from 'uuid/v4'
+import { undefinedToNullResolver } from './helpers/Resolver'
 
 export default {
   Mutation: {
@@ -38,18 +39,15 @@ export default {
           if (disable === undefined) disable = false // default for creation
           if (closed === undefined) closed = false // default for creation
           cypherHeader = `
-              MATCH (moderator:User {id: $moderatorId})
               MATCH (resource {id: $resourceId})
-              WHERE resource:User OR resource:Comment OR resource:Post
+              WHERE resource: User OR resource: Comment OR resource: Post
+              OPTIONAL MATCH (:User)-[lastDecision:DECIDED {last: true}]->(resource)
+              SET (CASE WHEN lastDecision IS NOT NULL THEN lastDecision END).last = false
+              WITH resource
+              MATCH (moderator:User {id: $moderatorId})
               CREATE (resource)<-[decision:DECIDED]-(moderator)
               SET decision.last = true
-              WITH decision, resource, moderator
-              OPTIONAL MATCH (:User)-[lastDecision:DECIDED {last: true}]->(resource)
-              SET (
-              CASE
-              WHEN lastDecision IS NOT NULL
-              THEN lastDecision END).last = false
-            `
+              `
         } else {
           // an open decision …
           if (disable === undefined) disable = existingDecisionTxResult.decision.properties.disable // default set to existing
@@ -77,24 +75,20 @@ export default {
         }
         let decisionUUID = null
         let cypherClosed = ''
-        // if (closed) {
-        //   decisionUUID = uuid()
-        //   cypherClosed = `
-        //       OPTIONAL MATCH (:User)-[report:REPORTED {closed: false}]->(resource)
-        //       SET report.closed = true, report.decisionUuid = $decisionUUID
-        //       SET decision.uuid = $decisionUUID
-        //     `
-        // }
+        if (closed) {
+          decisionUUID = uuid()
+          cypherClosed = `
+              WITH decision, resource, moderator
+              OPTIONAL MATCH (:User)-[report:REPORTED {closed: false}]->(resource)
+              SET (CASE WHEN report IS NOT NULL THEN report END).closed = true
+              SET (CASE WHEN report IS NOT NULL THEN report END).decisionUuid = $decisionUUID
+              SET decision.uuid = $decisionUUID
+            `
+        }
         const cypher =
           cypherHeader +
-          `SET (
-            CASE
-            WHEN decision.createdAt IS NOT NULL
-            THEN decision END).updatedAt = toString(datetime())
-            SET (
-            CASE
-            WHEN decision.createdAt IS NULL
-            THEN decision END).createdAt = toString(datetime())
+          `SET (CASE WHEN decision.createdAt IS NOT NULL THEN decision END).updatedAt = toString(datetime())
+            SET (CASE WHEN decision.createdAt IS NULL THEN decision END).createdAt = toString(datetime())
             SET decision.disable = $disable, decision.closed = $closed
             SET resource.disabled = $disable
           ` +
@@ -148,4 +142,7 @@ export default {
       return createdRelationshipWithNestedAttributes
     },
   },
+  DECIDED: {
+    ...undefinedToNullResolver(['updatedAt', 'uuid']),
+  },
 }
diff --git a/backend/src/schema/resolvers/reports.js b/backend/src/schema/resolvers/reports.js
index 083c94362..8e7533a02 100644
--- a/backend/src/schema/resolvers/reports.js
+++ b/backend/src/schema/resolvers/reports.js
@@ -1,3 +1,5 @@
+import { undefinedToNullResolver } from './helpers/Resolver'
+
 export default {
   Mutation: {
     report: async (_parent, params, context, _resolveInfo) => {
@@ -11,7 +13,7 @@ export default {
             MATCH (submitter:User {id: $submitterId})
             MATCH (resource {id: $resourceId})
             WHERE resource:User OR resource:Comment OR resource:Post
-            CREATE (resource)<-[report:REPORTED {createdAt: $createdAt, reasonCategory: $reasonCategory, reasonDescription: $reasonDescription}]-(submitter)
+            CREATE (resource)<-[report:REPORTED {createdAt: $createdAt, reasonCategory: $reasonCategory, reasonDescription: $reasonDescription, closed: false}]-(submitter)
             RETURN report, submitter, resource, labels(resource)[0] as type
           `,
           {
@@ -78,7 +80,9 @@ export default {
         const cypher = `
           MATCH (submitter:User)-[report:REPORTED]->(resource)
           WHERE resource:User OR resource:Comment OR resource:Post
-          RETURN report, submitter, resource, labels(resource)[0] as type
+          OPTIONAL MATCH (:User)-[decision:DECIDED {uuid: report.decisionUuid}]->(resource)
+          OPTIONAL MATCH (:User)-[decisionPending:DECIDED {last: true}]->(resource)
+          RETURN report, submitter, resource, labels(resource)[0] as type, decision, decisionPending
           ${orderByClause}
         `
         const result = await session.run(cypher, {})
@@ -88,16 +92,28 @@ export default {
             submitter: r.get('submitter'),
             resource: r.get('resource'),
             type: r.get('type'),
+            decision: r.get('decision'),
+            decisionPending: r.get('decisionPending'),
           }
         })
         if (!dbResponse) return null
 
         response = []
         dbResponse.forEach(ele => {
-          const { report, submitter, resource, type } = ele
+          const { report, submitter, resource, type, decision, decisionPending } = ele
 
           const responseEle = {
             ...report.properties,
+            decisionAt: decision
+              ? decision.properties.updatedAt
+              : decisionPending
+              ? decisionPending.properties.updatedAt
+              : null,
+            decisionDisable: decision
+              ? decision.properties.disable
+              : decisionPending
+              ? decisionPending.properties.disable
+              : null,
             post: null,
             comment: null,
             user: null,
@@ -122,7 +138,19 @@ export default {
         session.close()
       }
 
+      // Wolle console.log('response: ')
+      // response.forEach((ele, index) => {
+      //   // console.log('ele #', index, ': ', ele)
+      //   // if (ele.decision === undefined)
+      //   // console.log('ele #', index, ': ', ele)
+      //   if (ele.decision) console.log('ele #', index, ': ', ele)
+      // })
+      // // Wolle console.log('response: ', response)
+
       return response
     },
   },
+  REPORTED: {
+    ...undefinedToNullResolver(['decisionUuid', 'decisionAt', 'decisionDisable']),
+  },
 }
diff --git a/backend/src/schema/resolvers/reports.spec.js b/backend/src/schema/resolvers/reports.spec.js
index 21b1b4a7b..305ede92b 100644
--- a/backend/src/schema/resolvers/reports.spec.js
+++ b/backend/src/schema/resolvers/reports.spec.js
@@ -411,6 +411,7 @@ describe('report resources', () => {
       })
     })
   })
+
   describe('query for reported resource', () => {
     const reportsQuery = gql`
       query {
diff --git a/backend/src/schema/types/type/DECIDED.gql b/backend/src/schema/types/type/DECIDED.gql
index d76534256..8469a9d79 100644
--- a/backend/src/schema/types/type/DECIDED.gql
+++ b/backend/src/schema/types/type/DECIDED.gql
@@ -5,8 +5,7 @@ type DECIDED {
   # reasonDescription: String
   disable: Boolean!
   closed: Boolean!
-
-  # internal
+  uuid: ID
   last: Boolean!
   
   moderator: User
@@ -15,7 +14,7 @@ type DECIDED {
   # resource: ReportResource
   #   @cypher(statement: "MATCH (resource)<-[:DECIDED]-(:User) RETURN resource")
   type: String
-    @cypher(statement: "MATCH (resource)<-[:DECIDED]-(:User) RETURN labels(resource)[0]")
+    @cypher(statement: "MATCH (resource)<-[:DECIDED]-(user:User) RETURN labels(resource)[0]")
   user: User
   post: Post
   comment: Comment
diff --git a/backend/src/schema/types/type/NOTIFIED.gql b/backend/src/schema/types/type/NOTIFIED.gql
index 5082b5f7f..6610aa4ca 100644
--- a/backend/src/schema/types/type/NOTIFIED.gql
+++ b/backend/src/schema/types/type/NOTIFIED.gql
@@ -25,7 +25,7 @@ enum NotificationReason {
 type Query {
   notifications(read: Boolean, orderBy: NotificationOrdering): [NOTIFIED]
 }
-
+  
 type Mutation {
   markAsRead(id: ID!): NOTIFIED
 }
diff --git a/backend/src/schema/types/type/REPORTED.gql b/backend/src/schema/types/type/REPORTED.gql
index abbf2a7d4..8fce8011f 100644
--- a/backend/src/schema/types/type/REPORTED.gql
+++ b/backend/src/schema/types/type/REPORTED.gql
@@ -1,7 +1,16 @@
 type REPORTED {
-  createdAt: String
-  reasonCategory: ReasonCategory
-  reasonDescription: String
+  createdAt: String!
+  reasonCategory: ReasonCategory!
+  reasonDescription: String!
+  closed: Boolean!
+  decisionUuid: ID
+
+  decisionDisable: Boolean
+  decisionAt: String
+
+  # Wolle decision: DECIDED
+    # @cypher(statement: "MATCH (resource)<-[decision:DECIDED {uuid: $decisionUuid}]-(user:User) RETURN decision")
+
   submitter: User
     @cypher(statement: "MATCH (resource)<-[:REPORTED]-(user:User) RETURN user")
   # not yet supported
@@ -12,8 +21,6 @@ type REPORTED {
   user: User
   post: Post
   comment: Comment
-
-  # decided: DECIDED
 }
 
 # this list equals the strings of an array in file "webapp/constants/modals.js"
diff --git a/backend/src/seed/seed-db.js b/backend/src/seed/seed-db.js
index 9b5b400ab..a2b90b9e5 100644
--- a/backend/src/seed/seed-db.js
+++ b/backend/src/seed/seed-db.js
@@ -697,6 +697,14 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
     // report content a second time
     authenticatedUser = await dewey.toJson()
     await Promise.all([
+      mutate({
+        mutation: reportMutation,
+        variables: {
+          resourceId: 'c5',
+          reasonCategory: 'doxing',
+          reasonDescription: "That's my friends privat data!",
+        },
+      }),
       mutate({
         mutation: reportMutation,
         variables: {
diff --git a/neo4j/change_disabled_relationship_to_decided_relationship.sh b/neo4j/change_disabled_relationship_to_decided_relationship.sh
index 8fb3ac4b2..18d10a8cf 100755
--- a/neo4j/change_disabled_relationship_to_decided_relationship.sh
+++ b/neo4j/change_disabled_relationship_to_decided_relationship.sh
@@ -20,5 +20,8 @@ MATCH (moderator:User)-[disabled:DISABLED]->(resource)
 DELETE disabled
 CREATE (moderator)-[decision:DECIDED]->(resource)
 SET decision.createdAt = toString(datetime()), decision.disable = true, decision.last = true, decision.closed = false
-RETURN decision;
+WITH decision
+MATCH (:User)-[report:REPORTED]->(resource)
+SET report.closed = false
+RETURN decision, report;
 " | cypher-shell
diff --git a/webapp/graphql/Moderation.js b/webapp/graphql/Moderation.js
index 391c08062..be87be1de 100644
--- a/webapp/graphql/Moderation.js
+++ b/webapp/graphql/Moderation.js
@@ -8,6 +8,10 @@ export const reportListQuery = () => {
         createdAt
         reasonCategory
         reasonDescription
+        closed
+        decisionUuid
+        decisionAt
+        decisionDisable
         type
         submitter {
           id
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 11e2053df..90902ee20 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -454,8 +454,9 @@
       "type": "Typ",
       "content": "Inhalt",
       "author": "Autor",
-      "decision": "Entscheidung",
+      "decided": "Entschieden",
       "noDecision": "Keine Entscheidung!",
+      "enabledBy": "Aktiviert von",
       "disabledBy": "Deaktiviert von",
       "reasonCategory": "Kategorie",
       "reasonDescription": "Beschreibung",
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index e969013ab..3bc2ed7d4 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -455,8 +455,9 @@
       "type": "Type",
       "content": "Content",
       "author": "Author",
-      "decision": "Decision",
+      "decided": "Decided",
       "noDecision": "No decision!",
+      "enabledBy": "Enabled by",
       "disabledBy": "Disabled by",
       "reasonCategory": "Category",
       "reasonDescription": "Description",
diff --git a/webapp/pages/moderation/index.vue b/webapp/pages/moderation/index.vue
index 35c8addfb..1451b8ded 100644
--- a/webapp/pages/moderation/index.vue
+++ b/webapp/pages/moderation/index.vue
@@ -87,17 +87,30 @@
               <span v-else>—</span>
             </td>
             <td class="ds-table-col ds-table-head-col-border">
-              <!-- disabledBy -->
+              <!-- closed -->
+              <span v-if="content.closed" class="decision">
+                {{ $t('moderation.reports.decided') }}
+              </span>
+              <span v-else class="no-decision">
+                {{ $t('moderation.reports.noDecision') }}
+              </span>
+              <!-- decidedByModerator -->
               <div v-if="content.resource.decidedByModerator">
-                {{ $t('moderation.reports.disabledBy') }}
                 <br />
+                <div v-if="content.decisionDisable">
+                  {{ $t('moderation.reports.disabledBy') }}
+                </div>
+                <div v-else>
+                  {{ $t('moderation.reports.enabledBy') }}
+                </div>
                 <hc-user
                   :user="content.resource.decidedByModerator"
                   :showAvatar="false"
                   :trunc="30"
+                  :date-time="content.decisionAt"
+                  positionDatetime="below"
                 />
               </div>
-              <span v-else class="no-decision">{{ $t('moderation.reports.noDecision') }}</span>
             </td>
           </tr>
           <tr>
@@ -175,6 +188,7 @@ export default {
     reports: {
       immediate: true,
       handler(newReports) {
+        // Wolle console.log('newReports: ', newReports)
         const newReportedContentStructure = []
         newReports.forEach(report => {
           const resource =
@@ -192,6 +206,10 @@ export default {
           if (idx === -1) {
             idx = newReportedContentStructure.length
             newReportedContentStructure.push({
+              closed: report.closed,
+              decisionUuid: report.decisionUuid,
+              decisionAt: report.decisionAt,
+              decisionDisable: report.decisionDisable,
               type: report.type,
               resource,
               user: report.user,
@@ -203,6 +221,7 @@ export default {
           }
           newReportedContentStructure[idx].reports.push(report)
         })
+        // Wolle console.log('newReportedContentStructure: ', newReportedContentStructure)
         this.reportedContentStructure = newReportedContentStructure
       },
     },
@@ -221,6 +240,9 @@ export default {
 .ds-table-head-col-border {
   border-bottom: $border-color-softer dotted $border-size-base;
 }
+.decision {
+  color: $color-secondary;
+}
 .no-decision {
   color: $text-color-danger;
 }

From f4a62b03dccc49667e8a7e91e1954f4ea26b4750 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Fri, 8 Nov 2019 09:10:34 +0100
Subject: [PATCH 022/174] Clarify 'decide' resolver, rename to 'latest'
 property

---
 backend/src/schema/resolvers/moderation.js | 57 ++++++++++++----------
 backend/src/schema/resolvers/reports.js    |  2 +-
 2 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/backend/src/schema/resolvers/moderation.js b/backend/src/schema/resolvers/moderation.js
index 1b6cc4027..a37d829f4 100644
--- a/backend/src/schema/resolvers/moderation.js
+++ b/backend/src/schema/resolvers/moderation.js
@@ -1,6 +1,23 @@
 import uuid from 'uuid/v4'
 import { undefinedToNullResolver } from './helpers/Resolver'
 
+const queryOpenDecisionWriteTransaction = (session, resourceId) => {
+  return session.writeTransaction(async txc => {
+    const queryOpenDecisionTransactionResponse = await txc.run(
+      `
+        MATCH (moderator:User)-[decision:DECIDED {closed: false}]->(resource {id: $resourceId})
+        WHERE resource:User OR resource:Comment OR resource:Post
+        RETURN decision, moderator {.id} AS decisionModerator
+      `,
+      { resourceId },
+    )
+    return queryOpenDecisionTransactionResponse.records.map(record => ({
+      decision: record.get('decision'),
+      decisionModerator: record.get('decisionModerator'),
+    }))
+  })
+}
+
 export default {
   Mutation: {
     decide: async (_object, params, context, _resolveInfo) => {
@@ -13,47 +30,32 @@ export default {
       const { user: moderator, driver } = context
 
       const session = driver.session()
-
-      const existingDecisionWriteTxResultPromise = session.writeTransaction(async txc => {
-        const decisionRelationshipTransactionResponse = await txc.run(
-          `
-            MATCH (moderator:User)-[decision:DECIDED {closed: false}]->(resource {id: $resourceId})
-            WHERE resource:User OR resource:Comment OR resource:Post
-            RETURN decision, moderator {.id} AS decisionModerator
-          `,
-          { resourceId },
-        )
-        return decisionRelationshipTransactionResponse.records.map(record => ({
-          decision: record.get('decision'),
-          decisionModerator: record.get('decisionModerator'),
-        }))
-      })
-
       try {
+        const queryOpenDecisionWriteTxResultPromise = queryOpenDecisionWriteTransaction(session, resourceId)
+        const [openDecisionTxResult] = await queryOpenDecisionWriteTxResultPromise
+
         let cypherHeader = ''
 
-        // is there an open decision?
-        const [existingDecisionTxResult] = await existingDecisionWriteTxResultPromise
-        if (!existingDecisionTxResult) {
+        if (!openDecisionTxResult) {
           // no open decision, then create one
           if (disable === undefined) disable = false // default for creation
           if (closed === undefined) closed = false // default for creation
           cypherHeader = `
               MATCH (resource {id: $resourceId})
               WHERE resource: User OR resource: Comment OR resource: Post
-              OPTIONAL MATCH (:User)-[lastDecision:DECIDED {last: true}]->(resource)
-              SET (CASE WHEN lastDecision IS NOT NULL THEN lastDecision END).last = false
+              OPTIONAL MATCH (:User)-[lastDecision:DECIDED {latest: true}]->(resource)
+              SET (CASE WHEN lastDecision IS NOT NULL THEN lastDecision END).latest = false
               WITH resource
               MATCH (moderator:User {id: $moderatorId})
               CREATE (resource)<-[decision:DECIDED]-(moderator)
-              SET decision.last = true
+              SET decision.latest = true
               `
         } else {
           // an open decision …
-          if (disable === undefined) disable = existingDecisionTxResult.decision.properties.disable // default set to existing
-          if (closed === undefined) closed = existingDecisionTxResult.decision.properties.closed // default set to existing
+          if (disable === undefined) disable = openDecisionTxResult.decision.properties.disable // default set to existing
+          if (closed === undefined) closed = openDecisionTxResult.decision.properties.closed // default set to existing
           // current moderator is not the same as old
-          if (moderator.id !== existingDecisionTxResult.decisionModerator.id) {
+          if (moderator.id !== openDecisionTxResult.decisionModerator.id) {
             // an open decision from different moderator, then change relation and properties
             cypherHeader = `
                 MATCH (moderator:User)-[oldDecision:DECIDED {closed: false}]->(resource {id: $resourceId})
@@ -99,14 +101,15 @@ export default {
         // console.log('disable: ', disable)
 
         const newDecisionWriteTxResultPromise = session.writeTransaction(async txc => {
-          const decisionRelationshipTransactionResponse = await txc.run(cypher, {
+          const mutateDecisionTransactionResponse = await txc.run(
+            cypher, {
             resourceId,
             moderatorId: moderator.id,
             disable,
             closed,
             decisionUUID,
           })
-          return decisionRelationshipTransactionResponse.records.map(record => ({
+          return mutateDecisionTransactionResponse.records.map(record => ({
             decision: record.get('decision'),
             resource: record.get('resource'),
             moderator: record.get('moderator'),
diff --git a/backend/src/schema/resolvers/reports.js b/backend/src/schema/resolvers/reports.js
index 8e7533a02..4e77ee5ec 100644
--- a/backend/src/schema/resolvers/reports.js
+++ b/backend/src/schema/resolvers/reports.js
@@ -81,7 +81,7 @@ export default {
           MATCH (submitter:User)-[report:REPORTED]->(resource)
           WHERE resource:User OR resource:Comment OR resource:Post
           OPTIONAL MATCH (:User)-[decision:DECIDED {uuid: report.decisionUuid}]->(resource)
-          OPTIONAL MATCH (:User)-[decisionPending:DECIDED {last: true}]->(resource)
+          OPTIONAL MATCH (:User)-[decisionPending:DECIDED {latest: true}]->(resource)
           RETURN report, submitter, resource, labels(resource)[0] as type, decision, decisionPending
           ${orderByClause}
         `

From 353687766e0cb57156b5cfcf58df7e1a7764bc7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Fri, 8 Nov 2019 09:41:28 +0100
Subject: [PATCH 023/174] Change 'DECIDED' property 'updatedAt' to always be
 set

---
 backend/src/schema/resolvers/moderation.js | 9 ++++-----
 backend/src/schema/types/type/DECIDED.gql  | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/backend/src/schema/resolvers/moderation.js b/backend/src/schema/resolvers/moderation.js
index a37d829f4..5a6f2e732 100644
--- a/backend/src/schema/resolvers/moderation.js
+++ b/backend/src/schema/resolvers/moderation.js
@@ -50,8 +50,7 @@ export default {
               CREATE (resource)<-[decision:DECIDED]-(moderator)
               SET decision.latest = true
               `
-        } else {
-          // an open decision …
+        } else { // an open decision …
           if (disable === undefined) disable = openDecisionTxResult.decision.properties.disable // default set to existing
           if (closed === undefined) closed = openDecisionTxResult.decision.properties.closed // default set to existing
           // current moderator is not the same as old
@@ -89,8 +88,8 @@ export default {
         }
         const cypher =
           cypherHeader +
-          `SET (CASE WHEN decision.createdAt IS NOT NULL THEN decision END).updatedAt = toString(datetime())
-            SET (CASE WHEN decision.createdAt IS NULL THEN decision END).createdAt = toString(datetime())
+          `SET decision.updatedAt = toString(datetime())
+            SET (CASE WHEN decision.createdAt IS NULL THEN decision END).createdAt = decision.updatedAt
             SET decision.disable = $disable, decision.closed = $closed
             SET resource.disabled = $disable
           ` +
@@ -146,6 +145,6 @@ export default {
     },
   },
   DECIDED: {
-    ...undefinedToNullResolver(['updatedAt', 'uuid']),
+    ...undefinedToNullResolver(['uuid']),
   },
 }
diff --git a/backend/src/schema/types/type/DECIDED.gql b/backend/src/schema/types/type/DECIDED.gql
index 8469a9d79..0c56a9896 100644
--- a/backend/src/schema/types/type/DECIDED.gql
+++ b/backend/src/schema/types/type/DECIDED.gql
@@ -1,6 +1,6 @@
 type DECIDED {
   createdAt: String!
-  updatedAt: String
+  updatedAt: String!
   # reasonCategory: ReasonCategory
   # reasonDescription: String
   disable: Boolean!

From 1a4ca722ca7c100a9ca43c29d91d2ece43739660 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Fri, 8 Nov 2019 09:46:47 +0100
Subject: [PATCH 024/174] Corrected icon color related to decision status

---
 webapp/pages/moderation/index.vue | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/webapp/pages/moderation/index.vue b/webapp/pages/moderation/index.vue
index 1451b8ded..e9fbaae49 100644
--- a/webapp/pages/moderation/index.vue
+++ b/webapp/pages/moderation/index.vue
@@ -29,10 +29,7 @@
           <tr valign="top">
             <td class="ds-table-col ds-table-head-col ds-table-head-col-border">
               <!-- Icon -->
-              <ds-text
-                :class="[!content.resource.decidedByModerator && 'no-decision']"
-                color="soft"
-              >
+              <ds-text :class="[!content.closed && 'no-decision']" color="soft">
                 <ds-icon
                   v-if="content.type === 'Post'"
                   v-tooltip="{ content: $t('report.contribution.type'), placement: 'right' }"
@@ -88,12 +85,12 @@
             </td>
             <td class="ds-table-col ds-table-head-col-border">
               <!-- closed -->
-              <span v-if="content.closed" class="decision">
+              <b v-if="content.closed" class="decision">
                 {{ $t('moderation.reports.decided') }}
-              </span>
-              <span v-else class="no-decision">
+              </b>
+              <b v-else class="no-decision">
                 {{ $t('moderation.reports.noDecision') }}
-              </span>
+              </b>
               <!-- decidedByModerator -->
               <div v-if="content.resource.decidedByModerator">
                 <br />

From f2ab84a5e9c6727cea48ca7b26e31a560349ef3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Fri, 8 Nov 2019 09:56:06 +0100
Subject: [PATCH 025/174] Change database script

---
 neo4j/change_disabled_relationship_to_decided_relationship.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/neo4j/change_disabled_relationship_to_decided_relationship.sh b/neo4j/change_disabled_relationship_to_decided_relationship.sh
index 18d10a8cf..5e119d84d 100755
--- a/neo4j/change_disabled_relationship_to_decided_relationship.sh
+++ b/neo4j/change_disabled_relationship_to_decided_relationship.sh
@@ -19,7 +19,7 @@ echo "
 MATCH (moderator:User)-[disabled:DISABLED]->(resource)
 DELETE disabled
 CREATE (moderator)-[decision:DECIDED]->(resource)
-SET decision.createdAt = toString(datetime()), decision.disable = true, decision.last = true, decision.closed = false
+SET decision.updatedAt = toString(datetime()), decision.createdAt = decision.updatedAt, decision.disable = true, decision.latest = true, decision.closed = false
 WITH decision
 MATCH (:User)-[report:REPORTED]->(resource)
 SET report.closed = false

From 3020a38de2fb48561b51468b36959a1ff2d78538 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Fri, 8 Nov 2019 09:56:18 +0100
Subject: [PATCH 026/174] Rename variable

---
 backend/src/schema/resolvers/moderation.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/src/schema/resolvers/moderation.js b/backend/src/schema/resolvers/moderation.js
index 5a6f2e732..dc65e6f16 100644
--- a/backend/src/schema/resolvers/moderation.js
+++ b/backend/src/schema/resolvers/moderation.js
@@ -99,7 +99,7 @@ export default {
         // Wolle console.log('cypher: ', cypher)
         // console.log('disable: ', disable)
 
-        const newDecisionWriteTxResultPromise = session.writeTransaction(async txc => {
+        const mutateDecisionWriteTxResultPromise = session.writeTransaction(async txc => {
           const mutateDecisionTransactionResponse = await txc.run(
             cypher, {
             resourceId,
@@ -115,7 +115,7 @@ export default {
             type: record.get('type'),
           }))
         })
-        const txResult = await newDecisionWriteTxResultPromise
+        const txResult = await mutateDecisionWriteTxResultPromise
         if (!txResult[0]) return null
         const { decision, resource, moderator: moderatorInResult, type } = txResult[0]
         createdRelationshipWithNestedAttributes = {

From 49bea62fa7643c84e620841cc05fefa806b745c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Fri, 8 Nov 2019 10:01:49 +0100
Subject: [PATCH 027/174] Clarified comments in 'decide' resolver

---
 backend/src/schema/resolvers/moderation.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/backend/src/schema/resolvers/moderation.js b/backend/src/schema/resolvers/moderation.js
index dc65e6f16..5faf8c551 100644
--- a/backend/src/schema/resolvers/moderation.js
+++ b/backend/src/schema/resolvers/moderation.js
@@ -50,12 +50,12 @@ export default {
               CREATE (resource)<-[decision:DECIDED]-(moderator)
               SET decision.latest = true
               `
-        } else { // an open decision …
+        } else { // an open decision, then change it
           if (disable === undefined) disable = openDecisionTxResult.decision.properties.disable // default set to existing
           if (closed === undefined) closed = openDecisionTxResult.decision.properties.closed // default set to existing
           // current moderator is not the same as old
           if (moderator.id !== openDecisionTxResult.decisionModerator.id) {
-            // an open decision from different moderator, then change relation and properties
+            // from a different moderator, then create relation with properties to new moderator
             cypherHeader = `
                 MATCH (moderator:User)-[oldDecision:DECIDED {closed: false}]->(resource {id: $resourceId})
                 WHERE resource:User OR resource:Comment OR resource:Post
@@ -67,7 +67,7 @@ export default {
                 SET decision = oldDecision
               `
           } else {
-            // an open decision from same moderator, then change properties
+            // an open decision from same moderator, then match this
             cypherHeader = `
                 MATCH (moderator:User)-[decision:DECIDED {closed: false}]->(resource {id: $resourceId})
                 WHERE resource:User OR resource:Comment OR resource:Post

From c2444a528834485c71ad3a67325f53a852181c46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Fri, 8 Nov 2019 16:26:46 +0100
Subject: [PATCH 028/174] Changed layout

---
 webapp/locales/de.json            |  7 ++++---
 webapp/locales/en.json            |  7 ++++---
 webapp/pages/moderation/index.vue | 26 +++++++++++++++++---------
 3 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 90902ee20..7460e82a2 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -451,9 +451,10 @@
     "reports": {
       "empty": "Glückwunsch, es gibt nichts zu moderieren.",
       "name": "Meldungen",
-      "type": "Typ",
-      "content": "Inhalt",
-      "author": "Autor",
+      "typeRowHeadline": "Typ",
+      "contentRowHeadline": "Inhalt",
+      "authorRowHeadline": "Autor",
+      "decisionRowHeadline": "Decision",
       "decided": "Entschieden",
       "noDecision": "Keine Entscheidung!",
       "enabledBy": "Aktiviert von",
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 3bc2ed7d4..638bbba46 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -452,9 +452,10 @@
     "reports": {
       "empty": "Congratulations, nothing to moderate.",
       "name": "Reports",
-      "type": "Type",
-      "content": "Content",
-      "author": "Author",
+      "typeRowHeadline": "Type",
+      "contentRowHeadline": "Content",
+      "authorRowHeadline": "Author",
+      "decisionRowHeadline": "Decision",
       "decided": "Decided",
       "noDecision": "No decision!",
       "enabledBy": "Enabled by",
diff --git a/webapp/pages/moderation/index.vue b/webapp/pages/moderation/index.vue
index e9fbaae49..442c5133a 100644
--- a/webapp/pages/moderation/index.vue
+++ b/webapp/pages/moderation/index.vue
@@ -9,19 +9,27 @@
     >
       <colgroup><col width="" /></colgroup>
       <template v-for="content in reportedContentStructure">
-        <thead :key="'thead-' + content.resource.id">
+        <thead
+          :class="[
+            content.closed ? 'decision' : 'no-decision',
+            'ds-table-col',
+            'ds-table-head-col',
+            'ds-table-head-col-border',
+          ]"
+          :key="'thead-' + content.resource.id"
+        >
           <tr valign="top">
-            <th class="ds-table-col ds-table-head-col ds-table-head-col-border">
-              {{ $t('moderation.reports.type') }}
+            <th>
+              {{ $t('moderation.reports.typeRowHeadline') }}
             </th>
-            <th class="ds-table-col ds-table-head-col ds-table-head-col-border">
-              {{ $t('moderation.reports.content') }}
+            <th>
+              {{ $t('moderation.reports.contentRowHeadline') }}
             </th>
-            <th class="ds-table-col ds-table-head-col ds-table-head-col-border">
-              {{ $t('moderation.reports.author') }}
+            <th>
+              {{ $t('moderation.reports.authorRowHeadline') }}
             </th>
-            <th class="ds-table-col ds-table-head-col ds-table-head-col-border">
-              {{ $t('moderation.reports.decision') }}
+            <th>
+              {{ $t('moderation.reports.decisionRowHeadline') }}
             </th>
           </tr>
         </thead>

From 553a3ca2cbbea2ba3801b7214495d1ca6d087bed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Fri, 8 Nov 2019 17:28:15 +0100
Subject: [PATCH 029/174] Implement 'decide' button and functionality

---
 backend/src/schema/resolvers/moderation.js | 11 ++--
 webapp/graphql/Moderation.js               | 10 ++++
 webapp/locales/de.json                     |  4 +-
 webapp/locales/en.json                     |  2 +
 webapp/pages/moderation/index.vue          | 58 +++++++++++++++-------
 5 files changed, 62 insertions(+), 23 deletions(-)

diff --git a/backend/src/schema/resolvers/moderation.js b/backend/src/schema/resolvers/moderation.js
index 5faf8c551..ff2a84a5a 100644
--- a/backend/src/schema/resolvers/moderation.js
+++ b/backend/src/schema/resolvers/moderation.js
@@ -31,7 +31,10 @@ export default {
 
       const session = driver.session()
       try {
-        const queryOpenDecisionWriteTxResultPromise = queryOpenDecisionWriteTransaction(session, resourceId)
+        const queryOpenDecisionWriteTxResultPromise = queryOpenDecisionWriteTransaction(
+          session,
+          resourceId,
+        )
         const [openDecisionTxResult] = await queryOpenDecisionWriteTxResultPromise
 
         let cypherHeader = ''
@@ -50,7 +53,8 @@ export default {
               CREATE (resource)<-[decision:DECIDED]-(moderator)
               SET decision.latest = true
               `
-        } else { // an open decision, then change it
+        } else {
+          // an open decision, then change it
           if (disable === undefined) disable = openDecisionTxResult.decision.properties.disable // default set to existing
           if (closed === undefined) closed = openDecisionTxResult.decision.properties.closed // default set to existing
           // current moderator is not the same as old
@@ -100,8 +104,7 @@ export default {
         // console.log('disable: ', disable)
 
         const mutateDecisionWriteTxResultPromise = session.writeTransaction(async txc => {
-          const mutateDecisionTransactionResponse = await txc.run(
-            cypher, {
+          const mutateDecisionTransactionResponse = await txc.run(cypher, {
             resourceId,
             moderatorId: moderator.id,
             disable,
diff --git a/webapp/graphql/Moderation.js b/webapp/graphql/Moderation.js
index be87be1de..352296825 100644
--- a/webapp/graphql/Moderation.js
+++ b/webapp/graphql/Moderation.js
@@ -110,3 +110,13 @@ export const reportMutation = () => {
     }
   `
 }
+
+export const decideMutation = () => {
+  return gql`
+    mutation($resourceId: ID!, $disable: Boolean, $closed: Boolean) {
+      decide(resourceId: $resourceId, disable: $disable, closed: $closed) {
+        disable
+      }
+    }
+  `
+}
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 7460e82a2..e38924d14 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -454,9 +454,11 @@
       "typeRowHeadline": "Typ",
       "contentRowHeadline": "Inhalt",
       "authorRowHeadline": "Autor",
-      "decisionRowHeadline": "Decision",
+      "decisionRowHeadline": "Entscheidung",
       "decided": "Entschieden",
       "noDecision": "Keine Entscheidung!",
+      "decideButton": "Entscheide",
+      "DecisionSuccess": "Erfolgreich entschieden!",
       "enabledBy": "Aktiviert von",
       "disabledBy": "Deaktiviert von",
       "reasonCategory": "Kategorie",
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 638bbba46..eb31c620d 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -458,6 +458,8 @@
       "decisionRowHeadline": "Decision",
       "decided": "Decided",
       "noDecision": "No decision!",
+      "decideButton": "Decide",
+      "DecisionSuccess": "Decided successfully!",
       "enabledBy": "Enabled by",
       "disabledBy": "Disabled by",
       "reasonCategory": "Category",
diff --git a/webapp/pages/moderation/index.vue b/webapp/pages/moderation/index.vue
index 442c5133a..72cde9cb6 100644
--- a/webapp/pages/moderation/index.vue
+++ b/webapp/pages/moderation/index.vue
@@ -8,7 +8,7 @@
       cellpadding="0"
     >
       <colgroup><col width="" /></colgroup>
-      <template v-for="content in reportedContentStructure">
+      <template v-for="(content, index) in reportedContentStructure">
         <thead
           :class="[
             content.closed ? 'decision' : 'no-decision',
@@ -77,28 +77,30 @@
                 <hc-user :user="content.user" :showAvatar="false" :trunc="30" />
               </div>
             </td>
+            <!-- contentBelongsToUser -->
             <td class="ds-table-col ds-table-head-col-border">
-              <ds-flex v-if="content.contentBelongsToUser">
-                <ds-flex-item width="20px">
-                  <ds-icon
-                    v-tooltip="{ content: $t('report.author'), placement: 'right' }"
-                    name="user"
-                  />
-                </ds-flex-item>
-                <ds-flex-item>
-                  <hc-user :user="content.contentBelongsToUser" :showAvatar="false" :trunc="30" />
-                </ds-flex-item>
-              </ds-flex>
+              <hc-user
+                v-if="content.contentBelongsToUser"
+                :user="content.contentBelongsToUser"
+                :showAvatar="false"
+                :trunc="30"
+              />
               <span v-else>—</span>
             </td>
             <td class="ds-table-col ds-table-head-col-border">
               <!-- closed -->
-              <b v-if="content.closed" class="decision">
+              <b v-if="content.closed">
                 {{ $t('moderation.reports.decided') }}
               </b>
-              <b v-else class="no-decision">
-                {{ $t('moderation.reports.noDecision') }}
-              </b>
+              <ds-button
+                v-else
+                danger
+                class="confirm"
+                icon="exclamation-circle"
+                @click="confirm(content.resource.id, index)"
+              >
+                {{ $t('moderation.reports.decideButton') }}
+              </ds-button>
               <!-- decidedByModerator -->
               <div v-if="content.resource.decidedByModerator">
                 <br />
@@ -153,7 +155,7 @@
 <script>
 import HcEmpty from '~/components/Empty.vue'
 import HcUser from '~/components/User/User'
-import { reportListQuery } from '~/graphql/Moderation.js'
+import { reportListQuery, decideMutation } from '~/graphql/Moderation.js'
 
 export default {
   components: {
@@ -231,9 +233,29 @@ export default {
       },
     },
   },
+  methods: {
+    async confirm(resourceId, index) {
+      this.$apollo
+        .mutate({
+          mutation: decideMutation(),
+          variables: { resourceId, closed: true },
+        })
+        .then(() => {
+          this.$toast.success(this.$t('moderation.reports.DecisionSuccess'))
+          this.$apollo.queries.reports.refetch()
+        })
+        .catch(error => this.$toast.error(error.message))
+    },
+  },
   apollo: {
     reports: {
       query: reportListQuery(),
+      variables() {
+        return {}
+      },
+      // Wolle update({ Post }) {
+      //   this.setCurrentPosts(Post)
+      // },
       fetchPolicy: 'cache-and-network',
     },
   },
@@ -249,6 +271,6 @@ export default {
   color: $color-secondary;
 }
 .no-decision {
-  color: $text-color-danger;
+  color: $color-warning;
 }
 </style>

From 4e49dfe9e12c35e5e41c0d05764a12eae4220b30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Mon, 11 Nov 2019 14:53:19 +0100
Subject: [PATCH 030/174] Add a confirm modal.

---
 webapp/components/ContentMenu.vue | 10 +++---
 webapp/components/Modal.vue       |  4 +--
 webapp/locales/de.json            | 36 +++++++++++++++++++-
 webapp/locales/en.json            | 36 +++++++++++++++++++-
 webapp/pages/moderation/index.vue | 55 +++++++++++++++++++++++++++++--
 5 files changed, 129 insertions(+), 12 deletions(-)

diff --git a/webapp/components/ContentMenu.vue b/webapp/components/ContentMenu.vue
index 521a8ed6e..3b1470fba 100644
--- a/webapp/components/ContentMenu.vue
+++ b/webapp/components/ContentMenu.vue
@@ -70,7 +70,7 @@ export default {
           routes.push({
             name: this.$t(`post.menu.delete`),
             callback: () => {
-              this.openModal('delete')
+              this.openModal('confirm', 'delete')
             },
             icon: 'trash',
           })
@@ -108,7 +108,7 @@ export default {
         routes.push({
           name: this.$t(`comment.menu.delete`),
           callback: () => {
-            this.openModal('delete')
+            this.openModal('confirm', 'delete')
           },
           icon: 'trash',
         })
@@ -137,7 +137,7 @@ export default {
           routes.push({
             name: this.$t(`release.${this.resourceType}.title`),
             callback: () => {
-              this.openModal('release', this.resource.id)
+              this.openModal('release')
             },
             icon: 'eye',
           })
@@ -190,13 +190,13 @@ export default {
       }
       toggleMenu()
     },
-    openModal(dialog) {
+    openModal(dialog, modalDataName = null) {
       this.$store.commit('modal/SET_OPEN', {
         name: dialog,
         data: {
           type: this.resourceType,
           resource: this.resource,
-          modalsData: this.modalsData,
+          modalData: modalDataName ? this.modalsData[modalDataName] : {},
         },
       })
     },
diff --git a/webapp/components/Modal.vue b/webapp/components/Modal.vue
index 3c83a0922..84a1871b5 100644
--- a/webapp/components/Modal.vue
+++ b/webapp/components/Modal.vue
@@ -23,11 +23,11 @@
       @close="close"
     />
     <confirm-modal
-      v-if="open === 'delete'"
+      v-if="open === 'confirm'"
       :id="data.resource.id"
       :type="data.type"
       :name="name"
-      :modalData="data.modalsData.delete"
+      :modalData="data.modalData"
       @close="close"
     />
   </div>
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index e38924d14..fabf3fc5d 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -464,7 +464,41 @@
       "reasonCategory": "Kategorie",
       "reasonDescription": "Beschreibung",
       "createdAt": "Datum",
-      "submitter": "Gemeldet von"
+      "submitter": "Gemeldet von",
+      "decideModal": {
+        "submit": "Abschließende Entscheidung",
+        "cancel": "Abbruch",
+        "User": {
+          "disable": {
+            "title": "Sperre den Benutzer abschließend",
+            "message": "Möchtest du den Benutzer \"<b>{name}</b>\" wirklich <b>gesperrt</b> lassen?"
+          },
+          "enable": {
+            "title": "Entsperre den Benutzer abschließend",
+            "message": "Möchtest du den Benutzer \"<b>{name}</b>\" wirklich <b>entsperrt</b> lassen?"
+          }
+        },
+        "Post": {
+          "disable": {
+            "title": "Sperre den Beitrag abschließend",
+            "message": "Möchtest du den Beitrag \"<b>{name}</b>\" wirklich <b>gesperrt</b> lassen?"
+          },
+          "enable": {
+            "title": "Entsperre den Beitrag abschließend",
+            "message": "Möchtest du den Beitrag \"<b>{name}</b>\" wirklich <b>entsperrt</b> lassen?"
+          }
+        },
+        "Comment": {
+          "disable": {
+            "title": "Sperre den Kommentar abschließend",
+            "message": "Möchtest du den Kommentar \"<b>{name}</b>\" wirklich <b>gesperrt</b> lassen?"
+          },
+          "enable": {
+            "title": "Entsperre den Kommentar abschließend",
+            "message": "Möchtest du den Kommentar \"<b>{name}</b>\" wirklich <b>entsperrt</b> lassen?"
+          }
+        }
+      }
     }
   },
   "disable": {
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index eb31c620d..3ebe8104b 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -465,7 +465,41 @@
       "reasonCategory": "Category",
       "reasonDescription": "Description",
       "createdAt": "Date",
-      "submitter": "Reported by"
+      "submitter": "Reported by",
+      "decideModal": {
+        "submit": "Final decision",
+        "cancel": "Cancel",
+        "User": {
+          "disable": {
+            "title": "Finally Disable User",
+            "message": "Do you really want to let the user \"<b>{name}</b>\" stay <b>disabled</b>?"
+          },
+          "enable": {
+            "title": "Finally Enable User",
+            "message": "Do you really want to let the user \"<b>{name}</b>\" stay <b>enabled</b>?"
+          }
+        },
+        "Post": {
+          "disable": {
+            "title": "Finally Disable Post",
+            "message": "Do you really want to let the post \"<b>{name}</b>\" stay <b>disabled</b>?"
+          },
+          "enable": {
+            "title": "Finally Enable Post",
+            "message": "Do you really want to let the post \"<b>{name}</b>\" stay <b>enabled</b>?"
+          }
+        },
+        "Comment": {
+          "disable": {
+            "title": "Finally Disable Comment",
+            "message": "Do you really want to let the comment \"<b>{name}</b>\" stay <b>disabled</b>?"
+          },
+          "enable": {
+            "title": "Finally Enable Comment",
+            "message": "Do you really want to let the comment \"<b>{name}</b>\" stay <b>enabled</b>?"
+          }
+        }
+      }
     }
   },
   "disable": {
diff --git a/webapp/pages/moderation/index.vue b/webapp/pages/moderation/index.vue
index 72cde9cb6..39ac245c6 100644
--- a/webapp/pages/moderation/index.vue
+++ b/webapp/pages/moderation/index.vue
@@ -8,7 +8,7 @@
       cellpadding="0"
     >
       <colgroup><col width="" /></colgroup>
-      <template v-for="(content, index) in reportedContentStructure">
+      <template v-for="content in reportedContentStructure">
         <thead
           :class="[
             content.closed ? 'decision' : 'no-decision',
@@ -97,7 +97,7 @@
                 danger
                 class="confirm"
                 icon="exclamation-circle"
-                @click="confirm(content.resource.id, index)"
+                @click="confirm(content)"
               >
                 {{ $t('moderation.reports.decideButton') }}
               </ds-button>
@@ -234,7 +234,10 @@ export default {
     },
   },
   methods: {
-    async confirm(resourceId, index) {
+    confirm(content) {
+      this.openModal(content)
+    },
+    async confirmCallback(resourceId) {
       this.$apollo
         .mutate({
           mutation: decideMutation(),
@@ -246,6 +249,52 @@ export default {
         })
         .catch(error => this.$toast.error(error.message))
     },
+    openModal(content) {
+      const identStart =
+        'moderation.reports.decideModal.' +
+        content.type +
+        '.' +
+        (content.decisionDisable ? 'disable' : 'enable')
+      this.$store.commit('modal/SET_OPEN', {
+        name: 'confirm',
+        data: {
+          type: content.type,
+          resource: content.resource,
+          modalData: {
+            titleIdent: identStart + '.title',
+            messageIdent: identStart + '.message',
+            messageParams: {
+              name:
+                content.type === 'User'
+                  ? content.user.name
+                  : content.type === 'Post'
+                  ? this.$filters.truncate(content.post.title, 30)
+                  : content.type === 'Comment'
+                  ? this.$filters.truncate(
+                      this.$filters.removeHtml(content.comment.contentExcerpt),
+                      30,
+                    )
+                  : '',
+            },
+            buttons: {
+              confirm: {
+                danger: true,
+                icon: 'exclamation-circle',
+                textIdent: 'moderation.reports.decideModal.submit',
+                callback: () => {
+                  this.confirmCallback(content.resource.id)
+                },
+              },
+              cancel: {
+                icon: 'close',
+                textIdent: 'moderation.reports.decideModal.cancel',
+                callback: () => {},
+              },
+            },
+          },
+        },
+      })
+    },
   },
   apollo: {
     reports: {

From c3f6ad0e44c714226a9d5875b0c377aa4f23b10b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Mon, 11 Nov 2019 16:38:48 +0100
Subject: [PATCH 031/174] Implement always show resource status

- Rename buttons after Roberts suggestion.
---
 webapp/locales/de.json            | 10 ++++++----
 webapp/locales/en.json            | 10 ++++++----
 webapp/pages/moderation/index.vue | 21 ++++++++++++++++++++-
 3 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index fabf3fc5d..f364647fe 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -455,18 +455,20 @@
       "contentRowHeadline": "Inhalt",
       "authorRowHeadline": "Autor",
       "decisionRowHeadline": "Entscheidung",
+      "enabled": "Status: Entsperrt",
+      "disabled": "Status: Gesperrt",
       "decided": "Entschieden",
       "noDecision": "Keine Entscheidung!",
-      "decideButton": "Entscheide",
+      "decideButton": "Bestätige",
       "DecisionSuccess": "Erfolgreich entschieden!",
-      "enabledBy": "Aktiviert von",
-      "disabledBy": "Deaktiviert von",
+      "enabledBy": "Status: Entsperrt von",
+      "disabledBy": "Status: Gesperrt von",
       "reasonCategory": "Kategorie",
       "reasonDescription": "Beschreibung",
       "createdAt": "Datum",
       "submitter": "Gemeldet von",
       "decideModal": {
-        "submit": "Abschließende Entscheidung",
+        "submit": "Bestätige Entscheidung",
         "cancel": "Abbruch",
         "User": {
           "disable": {
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 3ebe8104b..e8cb43070 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -456,18 +456,20 @@
       "contentRowHeadline": "Content",
       "authorRowHeadline": "Author",
       "decisionRowHeadline": "Decision",
+      "enabled": "State: Enabled",
+      "disabled": "State: Disabled",
       "decided": "Decided",
       "noDecision": "No decision!",
-      "decideButton": "Decide",
+      "decideButton": "Confirm",
       "DecisionSuccess": "Decided successfully!",
-      "enabledBy": "Enabled by",
-      "disabledBy": "Disabled by",
+      "enabledBy": "State: Enabled by",
+      "disabledBy": "State: Disabled by",
       "reasonCategory": "Category",
       "reasonDescription": "Description",
       "createdAt": "Date",
       "submitter": "Reported by",
       "decideModal": {
-        "submit": "Final decision",
+        "submit": "Confirm decision",
         "cancel": "Cancel",
         "User": {
           "disable": {
diff --git a/webapp/pages/moderation/index.vue b/webapp/pages/moderation/index.vue
index 39ac245c6..414d73679 100644
--- a/webapp/pages/moderation/index.vue
+++ b/webapp/pages/moderation/index.vue
@@ -37,7 +37,7 @@
           <tr valign="top">
             <td class="ds-table-col ds-table-head-col ds-table-head-col-border">
               <!-- Icon -->
-              <ds-text :class="[!content.closed && 'no-decision']" color="soft">
+              <ds-text color="soft">
                 <ds-icon
                   v-if="content.type === 'Post'"
                   v-tooltip="{ content: $t('report.contribution.type'), placement: 'right' }"
@@ -105,9 +105,11 @@
               <div v-if="content.resource.decidedByModerator">
                 <br />
                 <div v-if="content.decisionDisable">
+                  <ds-icon name="eye-slash" class="ban" />
                   {{ $t('moderation.reports.disabledBy') }}
                 </div>
                 <div v-else>
+                  <ds-icon name="eye" class="no-ban" />
                   {{ $t('moderation.reports.enabledBy') }}
                 </div>
                 <hc-user
@@ -118,6 +120,17 @@
                   positionDatetime="below"
                 />
               </div>
+              <div v-else>
+                <br />
+                <div v-if="content.resource.disabled">
+                  <ds-icon name="eye-slash" class="ban" />
+                  {{ $t('moderation.reports.disabled') }}
+                </div>
+                <div v-else>
+                  <ds-icon name="eye" class="no-ban" />
+                  {{ $t('moderation.reports.enabled') }}
+                </div>
+              </div>
             </td>
           </tr>
           <tr>
@@ -322,4 +335,10 @@ export default {
 .no-decision {
   color: $color-warning;
 }
+.ban {
+  color: $color-danger;
+}
+.no-ban {
+  color: $color-success;
+}
 </style>

From 3d147a1cffd9885e0fc7e13951481bbb281ce85f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Mon, 11 Nov 2019 17:53:51 +0100
Subject: [PATCH 032/174] Fix lint 'pt.json'

---
 webapp/locales/pt.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/locales/pt.json b/webapp/locales/pt.json
index d2d753527..ba3209b5f 100644
--- a/webapp/locales/pt.json
+++ b/webapp/locales/pt.json
@@ -689,7 +689,7 @@
     "agree": "Eu concordo!",
     "terms-of-service": {
       "title": "Termos do Serviço",
-      "description": "As seguintes condições de utilização constituem a base para a utilização da nossa rede. Ao registar-se, deve aceitar os termos de utilização e informaremos mais tarde sobre quaisquer alterações que possam ocorrer. A Human Connection Network é operada na Alemanha e, portanto, está sujeita à lei alemã. O local de jurisdição é Kirchheim / Teck. Para mais detalhes, veja a nossa impressão: <a href=\"https://human-connection.org/imprint\" target=\"_blank\" >https://human-connection.org/imprint</a> ",
+      "description": "As seguintes condições de utilização constituem a base para a utilização da nossa rede. Ao registar-se, deve aceitar os termos de utilização e informaremos mais tarde sobre quaisquer alterações que possam ocorrer. A Human Connection Network é operada na Alemanha e, portanto, está sujeita à lei alemã. O local de jurisdição é Kirchheim / Teck. Para mais detalhes, veja a nossa impressão: <a href=\"https://human-connection.org/imprint\" target=\"_blank\" >https://human-connection.org/imprint</a> "
     },   
     "use-and-license" : {
       "title": "Uso e Licença",

From b305bc27d71d0ef1aaa4d1feb8e0e2307835401f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Mon, 11 Nov 2019 18:02:01 +0100
Subject: [PATCH 033/174] Use eyes icon to show state of decision

---
 webapp/locales/de.json            | 8 ++++----
 webapp/locales/en.json            | 8 ++++----
 webapp/pages/moderation/index.vue | 4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 6dd77e60b..7f2fe9816 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -466,14 +466,14 @@
       "contentRowHeadline": "Inhalt",
       "authorRowHeadline": "Autor",
       "decisionRowHeadline": "Entscheidung",
-      "enabled": "Status: Entsperrt",
-      "disabled": "Status: Gesperrt",
+      "enabled": "Entsperrt",
+      "disabled": "Gesperrt",
       "decided": "Entschieden",
       "noDecision": "Keine Entscheidung!",
       "decideButton": "Bestätige",
       "DecisionSuccess": "Erfolgreich entschieden!",
-      "enabledBy": "Status: Entsperrt von",
-      "disabledBy": "Status: Gesperrt von",
+      "enabledBy": "Entsperrt von",
+      "disabledBy": "Gesperrt von",
       "reasonCategory": "Kategorie",
       "reasonDescription": "Beschreibung",
       "createdAt": "Datum",
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 726029d53..57e578fe1 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -467,14 +467,14 @@
       "contentRowHeadline": "Content",
       "authorRowHeadline": "Author",
       "decisionRowHeadline": "Decision",
-      "enabled": "State: Enabled",
-      "disabled": "State: Disabled",
+      "enabled": "Enabled",
+      "disabled": "Disabled",
       "decided": "Decided",
       "noDecision": "No decision!",
       "decideButton": "Confirm",
       "DecisionSuccess": "Decided successfully!",
-      "enabledBy": "State: Enabled by",
-      "disabledBy": "State: Disabled by",
+      "enabledBy": "Enabled by",
+      "disabledBy": "Disabled by",
       "reasonCategory": "Category",
       "reasonDescription": "Description",
       "createdAt": "Date",
diff --git a/webapp/pages/moderation/index.vue b/webapp/pages/moderation/index.vue
index 11d98abfd..dddbbb548 100644
--- a/webapp/pages/moderation/index.vue
+++ b/webapp/pages/moderation/index.vue
@@ -96,7 +96,7 @@
                 v-else
                 danger
                 class="confirm"
-                icon="exclamation-circle"
+                :icon="content.resource.disabled ? 'eye-slash' : 'eye'"
                 @click="confirm(content)"
               >
                 {{ $t('moderation.reports.decideButton') }}
@@ -292,7 +292,7 @@ export default {
             buttons: {
               confirm: {
                 danger: true,
-                icon: 'exclamation-circle',
+                icon: content.resource.disabled ? 'eye-slash' : 'eye',
                 textIdent: 'moderation.reports.decideModal.submit',
                 callback: () => {
                   this.confirmCallback(content.resource.id)

From bcd60c364de10416ee89239cd906742f1fefcdc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 14 Nov 2019 12:15:07 +0100
Subject: [PATCH 034/174] Refactor script for db change

---
 ...ed_relationship_to_decided_relationship.sh | 45 ++++++++++++++++---
 1 file changed, 38 insertions(+), 7 deletions(-)

diff --git a/neo4j/change_disabled_relationship_to_decided_relationship.sh b/neo4j/change_disabled_relationship_to_decided_relationship.sh
index 5e119d84d..2aef78d1a 100755
--- a/neo4j/change_disabled_relationship_to_decided_relationship.sh
+++ b/neo4j/change_disabled_relationship_to_decided_relationship.sh
@@ -16,12 +16,43 @@ do
 done
 
 echo "
-MATCH (moderator:User)-[disabled:DISABLED]->(resource)
+// convert old DISABLED to new REVIEWED-Case-FLAGGED structure
+MATCH (moderator:User)-[disabled:DISABLED]->(disabledResource)
+WHERE disabledResource:User OR disabledResource:Comment OR disabledResource:Post
 DELETE disabled
-CREATE (moderator)-[decision:DECIDED]->(resource)
-SET decision.updatedAt = toString(datetime()), decision.createdAt = decision.updatedAt, decision.disable = true, decision.latest = true, decision.closed = false
-WITH decision
-MATCH (:User)-[report:REPORTED]->(resource)
-SET report.closed = false
-RETURN decision, report;
+CREATE (moderator)-[review:REVIEWED]->(case:Case)-[:FLAGGED]->(disabledResource)
+SET review.updatedAt = toString(datetime()), review.createdAt = review.updatedAt, review.disable = true
+SET case.id = randomUUID(), case.updatedAt = toString(datetime()), case.createdAt = case.updatedAt, case.disable = true, case.closed = false
+
+// if disabledResource has no report, then create a moderators default report
+WITH moderator, disabledResource, case
+//, review
+//OPTIONAL MATCH (noReporterDisabledResource:User)-[:REPORTED]->(disabledResource)
+//WHERE noReporterDisabledResource IS NULL
+OPTIONAL MATCH (:User)-[notExistingReport:REPORTED]->(disabledResource)
+WHERE notExistingReport IS NULL
+//MATCH (noReporterDisabledResource:User)
+//WHERE NOT (noReporterDisabledResource:User)-[:REPORTED]->(disabledResource)
+CREATE (moderator)-[addModeratorReport:REPORTED]->(case)
+SET addModeratorReport.createdAt = toString(datetime()), addModeratorReport.reasonCategory = 'other', addModeratorReport.reasonDescription = 'Old DISABLED relation had no now mandatory report !!! Created automatically to ensure database consistency! Creation date is when the database manipulation happened.'
+
+// if disabledResource has reports, then convert them
+WITH disabledResource, case
+//, review
+MATCH (reporterDisabledResource:User)-[existingReport:REPORTED]->(disabledResource)
+DELETE existingReport
+CREATE (reporterDisabledResource)-[reportDisabledResource:REPORTED]->(case)
+SET reportDisabledResource = existingReport
+
+// for REPORTED resources without DISABLED relation which are handled above, create new REPORTED-Case-FLAGGED structure
+WITH
+MATCH (reporter:User)-[oldReport:REPORTED]->(noDisabledResource)
+WHERE noDisabledResource:User OR noDisabledResource:Comment OR noDisabledResource:Post
+DELETE oldReport
+CREATE (reporter)-[report:REPORTED]->(case:Case)
+MERGE (case)-[:FLAGGED]->(noDisabledResource)
+SET report = oldReport
+SET case.id = randomUUID(), case.updatedAt = toString(datetime()), case.createdAt = case.updatedAt, case.disable = false, case.closed = false
+
+RETURN disabledResource, noDisabledResource, review, report, addModeratorReport;
 " | cypher-shell

From d2442b73c964a7857a00489235300051cb331752 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Fri, 15 Nov 2019 10:49:55 +0100
Subject: [PATCH 035/174] Refactor report mutation

---
 backend/src/schema/resolvers/reports.js                   | 6 ++++++
 ...hange_disabled_relationship_to_decided_relationship.sh | 8 ++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/backend/src/schema/resolvers/reports.js b/backend/src/schema/resolvers/reports.js
index 4e77ee5ec..568b84e97 100644
--- a/backend/src/schema/resolvers/reports.js
+++ b/backend/src/schema/resolvers/reports.js
@@ -13,6 +13,12 @@ export default {
             MATCH (submitter:User {id: $submitterId})
             MATCH (resource {id: $resourceId})
             WHERE resource:User OR resource:Comment OR resource:Post
+            //CREATE (resource)<-[report:REPORTED {createdAt: $createdAt, reasonCategory: $reasonCategory, reasonDescription: $reasonDescription, closed: false}]-(submitter)
+            MATCH (resource)<-[:FLAGGED]-(case:Case {closed: false})
+            MERGE (resource)<-[:FLAGGED]-(case:Case {closed: false})
+            ON CREATE SET case.id = randomUUID(), case.updatedAt = toString(datetime()), case.createdAt = case.updatedAt, case.disable = true, case.closed = false
+            //WITH submitter, resource
+            CREATE (case)<-[report:REPORTED {createdAt: $createdAt, reasonCategory: $reasonCategory, reasonDescription: $reasonDescription}]-(submitter)
             CREATE (resource)<-[report:REPORTED {createdAt: $createdAt, reasonCategory: $reasonCategory, reasonDescription: $reasonDescription, closed: false}]-(submitter)
             RETURN report, submitter, resource, labels(resource)[0] as type
           `,
diff --git a/neo4j/change_disabled_relationship_to_decided_relationship.sh b/neo4j/change_disabled_relationship_to_decided_relationship.sh
index 2aef78d1a..efd711b95 100755
--- a/neo4j/change_disabled_relationship_to_decided_relationship.sh
+++ b/neo4j/change_disabled_relationship_to_decided_relationship.sh
@@ -29,10 +29,10 @@ WITH moderator, disabledResource, case
 //, review
 //OPTIONAL MATCH (noReporterDisabledResource:User)-[:REPORTED]->(disabledResource)
 //WHERE noReporterDisabledResource IS NULL
-OPTIONAL MATCH (:User)-[notExistingReport:REPORTED]->(disabledResource)
-WHERE notExistingReport IS NULL
-//MATCH (noReporterDisabledResource:User)
-//WHERE NOT (noReporterDisabledResource:User)-[:REPORTED]->(disabledResource)
+//OPTIONAL MATCH (:User)-[notExistingReport:REPORTED]->(disabledResource)
+//WHERE notExistingReport IS NULL
+OPTIONAL MATCH (noReporterDisabledResource:User)-[notExistingReport:REPORTED]->(disabledResource)
+WHERE NOT (noReporterDisabledResource)-[notExistingReport]->(disabledResource)
 CREATE (moderator)-[addModeratorReport:REPORTED]->(case)
 SET addModeratorReport.createdAt = toString(datetime()), addModeratorReport.reasonCategory = 'other', addModeratorReport.reasonDescription = 'Old DISABLED relation had no now mandatory report !!! Created automatically to ensure database consistency! Creation date is when the database manipulation happened.'
 

From 5c4eb36b12677d5768a7bbbd3691f8728c1030f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Fri, 15 Nov 2019 17:18:12 +0100
Subject: [PATCH 036/174] Get db manipulation script running

---
 ...ed_relationship_to_decided_relationship.sh | 57 +++++++++----------
 1 file changed, 27 insertions(+), 30 deletions(-)

diff --git a/neo4j/change_disabled_relationship_to_decided_relationship.sh b/neo4j/change_disabled_relationship_to_decided_relationship.sh
index efd711b95..21c7b0094 100755
--- a/neo4j/change_disabled_relationship_to_decided_relationship.sh
+++ b/neo4j/change_disabled_relationship_to_decided_relationship.sh
@@ -21,38 +21,35 @@ MATCH (moderator:User)-[disabled:DISABLED]->(disabledResource)
 WHERE disabledResource:User OR disabledResource:Comment OR disabledResource:Post
 DELETE disabled
 CREATE (moderator)-[review:REVIEWED]->(case:Case)-[:FLAGGED]->(disabledResource)
-SET review.updatedAt = toString(datetime()), review.createdAt = review.updatedAt, review.disable = true
-SET case.id = randomUUID(), case.updatedAt = toString(datetime()), case.createdAt = case.updatedAt, case.disable = true, case.closed = false
+SET review.createdAt = toString(datetime()), review.updatedAt = review.createdAt, review.disable = true
+SET case.id = randomUUID(), case.createdAt = toString(datetime()), case.updatedAt = case.createdAt, case.disable = true, case.closed = false
 
 // if disabledResource has no report, then create a moderators default report
 WITH moderator, disabledResource, case
-//, review
-//OPTIONAL MATCH (noReporterDisabledResource:User)-[:REPORTED]->(disabledResource)
-//WHERE noReporterDisabledResource IS NULL
-//OPTIONAL MATCH (:User)-[notExistingReport:REPORTED]->(disabledResource)
-//WHERE notExistingReport IS NULL
-OPTIONAL MATCH (noReporterDisabledResource:User)-[notExistingReport:REPORTED]->(disabledResource)
-WHERE NOT (noReporterDisabledResource)-[notExistingReport]->(disabledResource)
-CREATE (moderator)-[addModeratorReport:REPORTED]->(case)
-SET addModeratorReport.createdAt = toString(datetime()), addModeratorReport.reasonCategory = 'other', addModeratorReport.reasonDescription = 'Old DISABLED relation had no now mandatory report !!! Created automatically to ensure database consistency! Creation date is when the database manipulation happened.'
+OPTIONAL MATCH (disabledResourceReporter:User)-[existingReport:REPORTED]->(disabledResource)
+FOREACH(disabledResource IN CASE WHEN existingReport IS NULL THEN [1] ELSE [] END | 
+  CREATE (moderator)-[addModeratorReport:REPORTED]->(case)
+  SET addModeratorReport.createdAt = toString(datetime()), addModeratorReport.reasonCategory = 'other', addModeratorReport.reasonDescription = 'Old DISABLED relation had no now mandatory report !!! Created automatically to ensure database consistency! Creation date is when the database manipulation happened.'
+)
+FOREACH(disabledResource IN CASE WHEN existingReport IS NOT NULL THEN [1] ELSE [] END | 
+  CREATE (disabledResourceReporter)-[moveModeratorReport:REPORTED]->(case)
+  SET moveModeratorReport = existingReport
+  DELETE existingReport
+)
 
-// if disabledResource has reports, then convert them
-WITH disabledResource, case
-//, review
-MATCH (reporterDisabledResource:User)-[existingReport:REPORTED]->(disabledResource)
-DELETE existingReport
-CREATE (reporterDisabledResource)-[reportDisabledResource:REPORTED]->(case)
-SET reportDisabledResource = existingReport
-
-// for REPORTED resources without DISABLED relation which are handled above, create new REPORTED-Case-FLAGGED structure
-WITH
-MATCH (reporter:User)-[oldReport:REPORTED]->(noDisabledResource)
-WHERE noDisabledResource:User OR noDisabledResource:Comment OR noDisabledResource:Post
-DELETE oldReport
-CREATE (reporter)-[report:REPORTED]->(case:Case)
-MERGE (case)-[:FLAGGED]->(noDisabledResource)
-SET report = oldReport
-SET case.id = randomUUID(), case.updatedAt = toString(datetime()), case.createdAt = case.updatedAt, case.disable = false, case.closed = false
-
-RETURN disabledResource, noDisabledResource, review, report, addModeratorReport;
+RETURN disabledResource;
 " | cypher-shell
+
+echo "
+// for REPORTED resources without DISABLED relation which are handled above, create new REPORTED-Case-FLAGGED structure
+MATCH (reporter:User)-[oldReport:REPORTED]->(notDisabledResource)
+WHERE notDisabledResource:User OR notDisabledResource:Comment OR notDisabledResource:Post
+CREATE (reporter)-[report:REPORTED]->(case:Case)
+MERGE (case)-[:FLAGGED]->(notDisabledResource)
+ON CREATE SET case.id = randomUUID(), case.createdAt = toString(datetime()), case.updatedAt = case.createdAt, case.disable = false, case.closed = false
+SET report = oldReport
+DELETE oldReport
+
+RETURN notDisabledResource;
+" | cypher-shell
+

From 733f5c4d44835551497233716297df47f3db5c4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Fri, 15 Nov 2019 18:25:10 +0100
Subject: [PATCH 037/174] Rename db manipulation script file

---
 ...lationship.sh => change_disabled_relationship_to_case_node.sh} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename neo4j/{change_disabled_relationship_to_decided_relationship.sh => change_disabled_relationship_to_case_node.sh} (100%)

diff --git a/neo4j/change_disabled_relationship_to_decided_relationship.sh b/neo4j/change_disabled_relationship_to_case_node.sh
similarity index 100%
rename from neo4j/change_disabled_relationship_to_decided_relationship.sh
rename to neo4j/change_disabled_relationship_to_case_node.sh

From b569f46dadce5ef22055a3147fc1abb97732e037 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Mon, 18 Nov 2019 07:57:52 +0100
Subject: [PATCH 038/174] Refactor report mutation beginn

---
 backend/src/schema/resolvers/reports.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/schema/resolvers/reports.js b/backend/src/schema/resolvers/reports.js
index 568b84e97..623ecf8c7 100644
--- a/backend/src/schema/resolvers/reports.js
+++ b/backend/src/schema/resolvers/reports.js
@@ -15,7 +15,7 @@ export default {
             WHERE resource:User OR resource:Comment OR resource:Post
             //CREATE (resource)<-[report:REPORTED {createdAt: $createdAt, reasonCategory: $reasonCategory, reasonDescription: $reasonDescription, closed: false}]-(submitter)
             MATCH (resource)<-[:FLAGGED]-(case:Case {closed: false})
-            MERGE (resource)<-[:FLAGGED]-(case:Case {closed: false})
+            MERGE (resource)<-[:FLAGGED]-(case:Case)
             ON CREATE SET case.id = randomUUID(), case.updatedAt = toString(datetime()), case.createdAt = case.updatedAt, case.disable = true, case.closed = false
             //WITH submitter, resource
             CREATE (case)<-[report:REPORTED {createdAt: $createdAt, reasonCategory: $reasonCategory, reasonDescription: $reasonDescription}]-(submitter)

From 9d4c1b8753641833caa1cb26c7203a015fdd5413 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Mon, 18 Nov 2019 10:35:52 +0100
Subject: [PATCH 039/174] Renamed Case to CaseFolder in database restructure
 script

---
 ...ange_disabled_relationship_to_case_node.sh | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/neo4j/change_disabled_relationship_to_case_node.sh b/neo4j/change_disabled_relationship_to_case_node.sh
index 21c7b0094..e24842112 100755
--- a/neo4j/change_disabled_relationship_to_case_node.sh
+++ b/neo4j/change_disabled_relationship_to_case_node.sh
@@ -16,40 +16,40 @@ do
 done
 
 echo "
-// convert old DISABLED to new REVIEWED-Case-FLAGGED structure
+// convert old DISABLED to new REVIEWED-CaseFolder-FLAGGED structure
 MATCH (moderator:User)-[disabled:DISABLED]->(disabledResource)
 WHERE disabledResource:User OR disabledResource:Comment OR disabledResource:Post
 DELETE disabled
-CREATE (moderator)-[review:REVIEWED]->(case:Case)-[:FLAGGED]->(disabledResource)
+CREATE (moderator)-[review:REVIEWED]->(caseFolder:CaseFolder)-[:FLAGGED]->(disabledResource)
 SET review.createdAt = toString(datetime()), review.updatedAt = review.createdAt, review.disable = true
-SET case.id = randomUUID(), case.createdAt = toString(datetime()), case.updatedAt = case.createdAt, case.disable = true, case.closed = false
+SET caseFolder.id = randomUUID(), caseFolder.createdAt = toString(datetime()), caseFolder.updatedAt = caseFolder.createdAt, caseFolder.disable = true, caseFolder.closed = false
 
 // if disabledResource has no report, then create a moderators default report
-WITH moderator, disabledResource, case
+WITH moderator, disabledResource, caseFolder
 OPTIONAL MATCH (disabledResourceReporter:User)-[existingReport:REPORTED]->(disabledResource)
 FOREACH(disabledResource IN CASE WHEN existingReport IS NULL THEN [1] ELSE [] END | 
-  CREATE (moderator)-[addModeratorReport:REPORTED]->(case)
+  CREATE (moderator)-[addModeratorReport:REPORTED]->(caseFolder)
   SET addModeratorReport.createdAt = toString(datetime()), addModeratorReport.reasonCategory = 'other', addModeratorReport.reasonDescription = 'Old DISABLED relation had no now mandatory report !!! Created automatically to ensure database consistency! Creation date is when the database manipulation happened.'
 )
 FOREACH(disabledResource IN CASE WHEN existingReport IS NOT NULL THEN [1] ELSE [] END | 
-  CREATE (disabledResourceReporter)-[moveModeratorReport:REPORTED]->(case)
+  CREATE (disabledResourceReporter)-[moveModeratorReport:REPORTED]->(caseFolder)
   SET moveModeratorReport = existingReport
   DELETE existingReport
 )
 
-RETURN disabledResource;
+RETURN disabledResource {.id};
 " | cypher-shell
 
 echo "
-// for REPORTED resources without DISABLED relation which are handled above, create new REPORTED-Case-FLAGGED structure
+// for REPORTED resources without DISABLED relation which are handled above, create new REPORTED-CaseFolder-FLAGGED structure
 MATCH (reporter:User)-[oldReport:REPORTED]->(notDisabledResource)
 WHERE notDisabledResource:User OR notDisabledResource:Comment OR notDisabledResource:Post
-CREATE (reporter)-[report:REPORTED]->(case:Case)
-MERGE (case)-[:FLAGGED]->(notDisabledResource)
-ON CREATE SET case.id = randomUUID(), case.createdAt = toString(datetime()), case.updatedAt = case.createdAt, case.disable = false, case.closed = false
+CREATE (reporter)-[report:REPORTED]->(caseFolder:CaseFolder)
+MERGE (caseFolder)-[:FLAGGED]->(notDisabledResource)
+ON CREATE SET caseFolder.id = randomUUID(), caseFolder.createdAt = toString(datetime()), caseFolder.updatedAt = caseFolder.createdAt, caseFolder.disable = false, caseFolder.closed = false
 SET report = oldReport
 DELETE oldReport
 
-RETURN notDisabledResource;
+RETURN notDisabledResource {.id};
 " | cypher-shell
 

From 240bd84b45edc4f227cff7c9b4d616e2600b566f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Mon, 18 Nov 2019 10:36:49 +0100
Subject: [PATCH 040/174] Refactor report mutation

---
 backend/src/schema/resolvers/reports.js    | 27 +++++++++++++---------
 backend/src/schema/types/type/REPORTED.gql |  9 ++++----
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/backend/src/schema/resolvers/reports.js b/backend/src/schema/resolvers/reports.js
index 623ecf8c7..f368d75fd 100644
--- a/backend/src/schema/resolvers/reports.js
+++ b/backend/src/schema/resolvers/reports.js
@@ -5,6 +5,7 @@ export default {
     report: async (_parent, params, context, _resolveInfo) => {
       let createdRelationshipWithNestedAttributes
       const { resourceId, reasonCategory, reasonDescription } = params
+      // Wolle console.log('resourceId: ', resourceId)
       const { driver, user } = context
       const session = driver.session()
       const writeTxResultPromise = session.writeTransaction(async txc => {
@@ -12,15 +13,15 @@ export default {
           `
             MATCH (submitter:User {id: $submitterId})
             MATCH (resource {id: $resourceId})
-            WHERE resource:User OR resource:Comment OR resource:Post
-            //CREATE (resource)<-[report:REPORTED {createdAt: $createdAt, reasonCategory: $reasonCategory, reasonDescription: $reasonDescription, closed: false}]-(submitter)
-            MATCH (resource)<-[:FLAGGED]-(case:Case {closed: false})
-            MERGE (resource)<-[:FLAGGED]-(case:Case)
-            ON CREATE SET case.id = randomUUID(), case.updatedAt = toString(datetime()), case.createdAt = case.updatedAt, case.disable = true, case.closed = false
-            //WITH submitter, resource
-            CREATE (case)<-[report:REPORTED {createdAt: $createdAt, reasonCategory: $reasonCategory, reasonDescription: $reasonDescription}]-(submitter)
-            CREATE (resource)<-[report:REPORTED {createdAt: $createdAt, reasonCategory: $reasonCategory, reasonDescription: $reasonDescription, closed: false}]-(submitter)
-            RETURN report, submitter, resource, labels(resource)[0] as type
+            WHERE resource:User OR resource:Post OR resource:Comment
+            // no open caseFolder, create one
+            MERGE (resource)<-[:FLAGGED]-(caseFolder:CaseFolder {closed: false})
+            ON CREATE SET caseFolder.id = randomUUID(), caseFolder.createdAt = $createdAt, caseFolder.updatedAt = caseFolder.createdAt, caseFolder.disable = false, caseFolder.closed = false
+            // Create report on caseFolder
+            WITH submitter, resource, caseFolder
+            CREATE (caseFolder)<-[report:REPORTED {createdAt: $createdAt, reasonCategory: $reasonCategory, reasonDescription: $reasonDescription}]-(submitter)
+
+            RETURN caseFolder {.id}, submitter, report, resource, labels(resource)[0] AS type
           `,
           {
             resourceId,
@@ -31,18 +32,22 @@ export default {
           },
         )
         return reportRelationshipTransactionResponse.records.map(record => ({
-          report: record.get('report'),
+          caseFolder: record.get('caseFolder'),
           submitter: record.get('submitter'),
+          report: record.get('report'),
           resource: record.get('resource').properties,
           type: record.get('type'),
         }))
       })
       try {
+        // Wolle console.log('reasonCategory: ', reasonCategory)
         const txResult = await writeTxResultPromise
+        // Wolle console.log('txResult: ', txResult)
         if (!txResult[0]) return null
-        const { report, submitter, resource, type } = txResult[0]
+        const { caseFolder, submitter, report, resource, type } = txResult[0]
         createdRelationshipWithNestedAttributes = {
           ...report.properties,
+          caseFolderId: caseFolder.id,
           post: null,
           comment: null,
           user: null,
diff --git a/backend/src/schema/types/type/REPORTED.gql b/backend/src/schema/types/type/REPORTED.gql
index 8fce8011f..d9029179b 100644
--- a/backend/src/schema/types/type/REPORTED.gql
+++ b/backend/src/schema/types/type/REPORTED.gql
@@ -2,11 +2,12 @@ type REPORTED {
   createdAt: String!
   reasonCategory: ReasonCategory!
   reasonDescription: String!
-  closed: Boolean!
-  decisionUuid: ID
+  caseFolderId: ID!
+  closed: Boolean # ! Wolle comlete still needed?
+  decisionUuid: ID # Wolle still needed?
 
-  decisionDisable: Boolean
-  decisionAt: String
+  decisionDisable: Boolean # Wolle still needed?
+  decisionAt: String # Wolle still needed?
 
   # Wolle decision: DECIDED
     # @cypher(statement: "MATCH (resource)<-[decision:DECIDED {uuid: $decisionUuid}]-(user:User) RETURN decision")

From 3daba417deb90a78aa53c1cc17d4fd71bc946003 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Mon, 18 Nov 2019 11:23:53 +0100
Subject: [PATCH 041/174] Create CaseFolder GQL definition

---
 backend/src/schema/types/type/CaseFolder.gql | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 backend/src/schema/types/type/CaseFolder.gql

diff --git a/backend/src/schema/types/type/CaseFolder.gql b/backend/src/schema/types/type/CaseFolder.gql
new file mode 100644
index 000000000..0e643c9c0
--- /dev/null
+++ b/backend/src/schema/types/type/CaseFolder.gql
@@ -0,0 +1,9 @@
+type CaseFolder {
+  id: ID!
+  createdAt: String!
+  updatedAt: String!
+  disable: Boolean!
+  # reasonCategory: ReasonCategory!
+  # reasonDescription: String!
+  closed: Boolean!
+}

From 3b4de22855f8eac1765a80da8ad5b95bde6219a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Mon, 18 Nov 2019 11:25:47 +0100
Subject: [PATCH 042/174] Refactor reports mutation to CaseFolder structure

---
 backend/src/schema/resolvers/reports.js    | 41 ++++++++--------------
 backend/src/schema/types/type/REPORTED.gql |  9 +++--
 webapp/graphql/Moderation.js               |  8 ++---
 webapp/pages/moderation/index.vue          | 20 +++++------
 4 files changed, 33 insertions(+), 45 deletions(-)

diff --git a/backend/src/schema/resolvers/reports.js b/backend/src/schema/resolvers/reports.js
index f368d75fd..478376161 100644
--- a/backend/src/schema/resolvers/reports.js
+++ b/backend/src/schema/resolvers/reports.js
@@ -5,7 +5,6 @@ export default {
     report: async (_parent, params, context, _resolveInfo) => {
       let createdRelationshipWithNestedAttributes
       const { resourceId, reasonCategory, reasonDescription } = params
-      // Wolle console.log('resourceId: ', resourceId)
       const { driver, user } = context
       const session = driver.session()
       const writeTxResultPromise = session.writeTransaction(async txc => {
@@ -21,7 +20,7 @@ export default {
             WITH submitter, resource, caseFolder
             CREATE (caseFolder)<-[report:REPORTED {createdAt: $createdAt, reasonCategory: $reasonCategory, reasonDescription: $reasonDescription}]-(submitter)
 
-            RETURN caseFolder {.id}, submitter, report, resource, labels(resource)[0] AS type
+            RETURN submitter, report, caseFolder {.id}, resource, labels(resource)[0] AS type
           `,
           {
             resourceId,
@@ -32,19 +31,17 @@ export default {
           },
         )
         return reportRelationshipTransactionResponse.records.map(record => ({
-          caseFolder: record.get('caseFolder'),
           submitter: record.get('submitter'),
           report: record.get('report'),
+          caseFolder: record.get('caseFolder'),
           resource: record.get('resource').properties,
           type: record.get('type'),
         }))
       })
       try {
-        // Wolle console.log('reasonCategory: ', reasonCategory)
         const txResult = await writeTxResultPromise
-        // Wolle console.log('txResult: ', txResult)
         if (!txResult[0]) return null
-        const { caseFolder, submitter, report, resource, type } = txResult[0]
+        const { submitter, report, caseFolder, resource, type } = txResult[0]
         createdRelationshipWithNestedAttributes = {
           ...report.properties,
           caseFolderId: caseFolder.id,
@@ -89,42 +86,34 @@ export default {
       }
       try {
         const cypher = `
-          MATCH (submitter:User)-[report:REPORTED]->(resource)
-          WHERE resource:User OR resource:Comment OR resource:Post
-          OPTIONAL MATCH (:User)-[decision:DECIDED {uuid: report.decisionUuid}]->(resource)
-          OPTIONAL MATCH (:User)-[decisionPending:DECIDED {latest: true}]->(resource)
-          RETURN report, submitter, resource, labels(resource)[0] as type, decision, decisionPending
+          MATCH (submitter:User)-[report:REPORTED]->(caseFolder:CaseFolder)-[:FLAGGED]->(resource)
+          // Wolle OPTIONAL MATCH (reviewer:User)-[:REVIEWED]->(caseFolder)
+          WHERE resource:User OR resource:Post OR resource:Comment
+          RETURN submitter, report, caseFolder, resource, labels(resource)[0] as type
           ${orderByClause}
         `
         const result = await session.run(cypher, {})
         const dbResponse = result.records.map(r => {
           return {
-            report: r.get('report'),
             submitter: r.get('submitter'),
+            report: r.get('report'),
+            caseFolder: r.get('caseFolder'),
             resource: r.get('resource'),
             type: r.get('type'),
-            decision: r.get('decision'),
-            decisionPending: r.get('decisionPending'),
           }
         })
         if (!dbResponse) return null
 
         response = []
         dbResponse.forEach(ele => {
-          const { report, submitter, resource, type, decision, decisionPending } = ele
+          const { report, submitter, caseFolder, resource, type, decision, decisionPending } = ele
 
           const responseEle = {
             ...report.properties,
-            decisionAt: decision
-              ? decision.properties.updatedAt
-              : decisionPending
-              ? decisionPending.properties.updatedAt
-              : null,
-            decisionDisable: decision
-              ? decision.properties.disable
-              : decisionPending
-              ? decisionPending.properties.disable
-              : null,
+            caseFolderId: caseFolder.id,
+            caseFolderUpdatedAt: caseFolder.updatedAt,
+            caseFolderDisable: caseFolder.disable,
+            caseFolderClosed: caseFolder.closed,
             post: null,
             comment: null,
             user: null,
@@ -162,6 +151,6 @@ export default {
     },
   },
   REPORTED: {
-    ...undefinedToNullResolver(['decisionUuid', 'decisionAt', 'decisionDisable']),
+    // Wolle ...undefinedToNullResolver(['decisionUuid', 'decisionAt', 'decisionDisable']),
   },
 }
diff --git a/backend/src/schema/types/type/REPORTED.gql b/backend/src/schema/types/type/REPORTED.gql
index d9029179b..1d630e42b 100644
--- a/backend/src/schema/types/type/REPORTED.gql
+++ b/backend/src/schema/types/type/REPORTED.gql
@@ -2,12 +2,11 @@ type REPORTED {
   createdAt: String!
   reasonCategory: ReasonCategory!
   reasonDescription: String!
-  caseFolderId: ID!
-  closed: Boolean # ! Wolle comlete still needed?
-  decisionUuid: ID # Wolle still needed?
 
-  decisionDisable: Boolean # Wolle still needed?
-  decisionAt: String # Wolle still needed?
+  caseFolderId: ID!
+  caseFolderDisable: Boolean!
+  caseFolderUpdatedAt: String!
+  caseFolderClosed: Boolean!
 
   # Wolle decision: DECIDED
     # @cypher(statement: "MATCH (resource)<-[decision:DECIDED {uuid: $decisionUuid}]-(user:User) RETURN decision")
diff --git a/webapp/graphql/Moderation.js b/webapp/graphql/Moderation.js
index 352296825..ea2da0df1 100644
--- a/webapp/graphql/Moderation.js
+++ b/webapp/graphql/Moderation.js
@@ -8,10 +8,10 @@ export const reportListQuery = () => {
         createdAt
         reasonCategory
         reasonDescription
-        closed
-        decisionUuid
-        decisionAt
-        decisionDisable
+        caseFolderId
+        caseFolderUpdatedAt
+        caseFolderDisable
+        caseFolderClosed
         type
         submitter {
           id
diff --git a/webapp/pages/moderation/index.vue b/webapp/pages/moderation/index.vue
index dddbbb548..77d3ecc73 100644
--- a/webapp/pages/moderation/index.vue
+++ b/webapp/pages/moderation/index.vue
@@ -11,7 +11,7 @@
       <template v-for="content in reportedContentStructure">
         <thead
           :class="[
-            content.closed ? 'decision' : 'no-decision',
+            content.caseFolderClosed ? 'decision' : 'no-decision',
             'ds-table-col',
             'ds-table-head-col',
             'ds-table-head-col-border',
@@ -88,8 +88,8 @@
               <span v-else>—</span>
             </td>
             <td class="ds-table-col ds-table-head-col-border">
-              <!-- closed -->
-              <b v-if="content.closed">
+              <!-- caseFolderClosed -->
+              <b v-if="content.caseFolderClosed">
                 {{ $t('moderation.reports.decided') }}
               </b>
               <ds-button
@@ -104,7 +104,7 @@
               <!-- decidedByModerator -->
               <div v-if="content.resource.decidedByModerator">
                 <br />
-                <div v-if="content.decisionDisable">
+                <div v-if="content.caseFolderDisable">
                   <ds-icon name="eye-slash" class="ban" />
                   {{ $t('moderation.reports.disabledBy') }}
                 </div>
@@ -116,7 +116,7 @@
                   :user="content.resource.decidedByModerator"
                   :showAvatar="false"
                   :trunc="30"
-                  :date-time="content.decisionAt"
+                  :date-time="content.caseFolderUpdatedAt"
                   positionDatetime="below"
                 />
               </div>
@@ -226,10 +226,10 @@ export default {
           if (idx === -1) {
             idx = newReportedContentStructure.length
             newReportedContentStructure.push({
-              closed: report.closed,
-              decisionUuid: report.decisionUuid,
-              decisionAt: report.decisionAt,
-              decisionDisable: report.decisionDisable,
+              caseFolderId: report.caseFolderId,
+              caseFolderUpdatedAt: report.caseFolderUpdatedAt,
+              caseFolderDisable: report.caseFolderDisable,
+              caseFolderClosed: report.caseFolderClosed,
               type: report.type,
               resource,
               user: report.user,
@@ -267,7 +267,7 @@ export default {
         'moderation.reports.decideModal.' +
         content.type +
         '.' +
-        (content.decisionDisable ? 'disable' : 'enable')
+        (content.caseFolderDisable ? 'disable' : 'enable')
       this.$store.commit('modal/SET_OPEN', {
         name: 'confirm',
         data: {

From 7c3ec289f721fcf4925542147705a3e769fcca2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Wed, 20 Nov 2019 08:33:47 +0100
Subject: [PATCH 043/174] Start refactor the decide mutation to CaseFolder
 structure

---
 backend/src/schema/resolvers/moderation.js | 28 +++++++++++++---------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/backend/src/schema/resolvers/moderation.js b/backend/src/schema/resolvers/moderation.js
index ff2a84a5a..7876439d0 100644
--- a/backend/src/schema/resolvers/moderation.js
+++ b/backend/src/schema/resolvers/moderation.js
@@ -5,15 +5,21 @@ const queryOpenDecisionWriteTransaction = (session, resourceId) => {
   return session.writeTransaction(async txc => {
     const queryOpenDecisionTransactionResponse = await txc.run(
       `
-        MATCH (moderator:User)-[decision:DECIDED {closed: false}]->(resource {id: $resourceId})
-        WHERE resource:User OR resource:Comment OR resource:Post
-        RETURN decision, moderator {.id} AS decisionModerator
+        //MATCH (moderator:User)-[decision:DECIDED {closed: false}]->(resource {id: $resourceId})
+        //WHERE resource:User OR resource:Comment OR resource:Post
+        //RETURN decision, moderator {.id} AS decisionModerator
+
+        // Wolle only review on reported resources
+
+        MATCH (moderator:User)-[:REPORTED]->(caseFolder:CaseFolder {closed: false})-[:FLAGGED]->(resource {id: $resourceId})
+        WHERE resource:User OR resource:Post OR resource:Comment
+        RETURN caseFolder, moderator {.id} AS caseModerator
       `,
       { resourceId },
     )
     return queryOpenDecisionTransactionResponse.records.map(record => ({
-      decision: record.get('decision'),
-      decisionModerator: record.get('decisionModerator'),
+      caseFolder: record.get('caseFolder'),
+      caseModerator: record.get('caseModerator'),
     }))
   })
 }
@@ -40,7 +46,7 @@ export default {
         let cypherHeader = ''
 
         if (!openDecisionTxResult) {
-          // no open decision, then create one
+          // no open caseFolder, then create one
           if (disable === undefined) disable = false // default for creation
           if (closed === undefined) closed = false // default for creation
           cypherHeader = `
@@ -54,11 +60,11 @@ export default {
               SET decision.latest = true
               `
         } else {
-          // an open decision, then change it
-          if (disable === undefined) disable = openDecisionTxResult.decision.properties.disable // default set to existing
-          if (closed === undefined) closed = openDecisionTxResult.decision.properties.closed // default set to existing
+          // an open caseFolder, then change it
+          if (disable === undefined) disable = openDecisionTxResult.caseFolder.properties.disable // default set to existing
+          if (closed === undefined) closed = openDecisionTxResult.caseFolder.properties.closed // default set to existing
           // current moderator is not the same as old
-          if (moderator.id !== openDecisionTxResult.decisionModerator.id) {
+          if (moderator.id !== openDecisionTxResult.caseModerator.id) {
             // from a different moderator, then create relation with properties to new moderator
             cypherHeader = `
                 MATCH (moderator:User)-[oldDecision:DECIDED {closed: false}]->(resource {id: $resourceId})
@@ -71,7 +77,7 @@ export default {
                 SET decision = oldDecision
               `
           } else {
-            // an open decision from same moderator, then match this
+            // an open caseFolder from same moderator, then match this
             cypherHeader = `
                 MATCH (moderator:User)-[decision:DECIDED {closed: false}]->(resource {id: $resourceId})
                 WHERE resource:User OR resource:Comment OR resource:Post

From cf02ca450653bbe6978e131a16511beeb722d525 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Wed, 20 Nov 2019 15:17:29 +0100
Subject: [PATCH 044/174] Refactor decide mutation to new CaseFolder structure

---
 backend/src/models/Comment.js                 |  12 +-
 backend/src/models/Post.js                    |  12 +-
 backend/src/models/User.js                    |  12 +-
 backend/src/schema/index.js                   |   4 +-
 backend/src/schema/resolvers/comments.js      |  29 ++-
 backend/src/schema/resolvers/moderation.js    | 245 +++++++++++-------
 .../src/schema/resolvers/moderation.spec.js   |  24 +-
 backend/src/schema/resolvers/posts.js         |   2 +-
 backend/src/schema/resolvers/users.js         |   2 +-
 backend/src/schema/types/type/Comment.gql     |  11 +-
 backend/src/schema/types/type/Post.gql        |  10 +-
 .../types/type/{DECIDED.gql => REVIEWED.gql}  |  12 +-
 backend/src/schema/types/type/User.gql        |  10 +-
 webapp/graphql/Moderation.js                  |   6 +-
 webapp/pages/moderation/index.vue             |   6 +-
 15 files changed, 254 insertions(+), 143 deletions(-)
 rename backend/src/schema/types/type/{DECIDED.gql => REVIEWED.gql} (54%)

diff --git a/backend/src/models/Comment.js b/backend/src/models/Comment.js
index ee2f9512d..06ebe2930 100644
--- a/backend/src/models/Comment.js
+++ b/backend/src/models/Comment.js
@@ -25,12 +25,12 @@ module.exports = {
     target: 'User',
     direction: 'in',
   },
-  decidedByModerator: {
-    type: 'relationship',
-    relationship: 'DECIDED',
-    target: 'User',
-    direction: 'in',
-  },
+  // Wolle reviewedByModerator: {
+  //   type: 'relationship',
+  //   relationship: 'DECIDED',
+  //   target: 'User',
+  //   direction: 'in',
+  // },
   notified: {
     type: 'relationship',
     relationship: 'NOTIFIED',
diff --git a/backend/src/models/Post.js b/backend/src/models/Post.js
index 2d812d491..695664a56 100644
--- a/backend/src/models/Post.js
+++ b/backend/src/models/Post.js
@@ -17,12 +17,12 @@ module.exports = {
   image: { type: 'string', allow: [null] },
   deleted: { type: 'boolean', default: false },
   disabled: { type: 'boolean', default: false },
-  decidedByModerator: {
-    type: 'relationship',
-    relationship: 'DECIDED',
-    target: 'User',
-    direction: 'in',
-  },
+  // Wolle reviewedByModerator: {
+  //   type: 'relationship',
+  //   relationship: 'DECIDED',
+  //   target: 'User',
+  //   direction: 'in',
+  // },
   notified: {
     type: 'relationship',
     relationship: 'NOTIFIED',
diff --git a/backend/src/models/User.js b/backend/src/models/User.js
index 329ee6f8d..48f887406 100644
--- a/backend/src/models/User.js
+++ b/backend/src/models/User.js
@@ -42,12 +42,12 @@ module.exports = {
     },
   },
   friends: { type: 'relationship', relationship: 'FRIENDS', target: 'User', direction: 'both' },
-  decidedByModerator: {
-    type: 'relationship',
-    relationship: 'DECIDED',
-    target: 'User',
-    direction: 'in',
-  },
+  // Wolle reviewedByModerator: {
+  //   type: 'relationship',
+  //   relationship: 'DECIDED',
+  //   target: 'User',
+  //   direction: 'in',
+  // },
   rewarded: {
     type: 'relationship',
     relationship: 'REWARDED',
diff --git a/backend/src/schema/index.js b/backend/src/schema/index.js
index 5fefe26f7..d66662acf 100644
--- a/backend/src/schema/index.js
+++ b/backend/src/schema/index.js
@@ -24,7 +24,7 @@ export default applyScalars(
             'SocialMedia',
             'NOTIFIED',
             'REPORTED',
-            'DECIDED',
+            'REVIEWED',
             'Donations',
           ],
           // add 'User' here as soon as possible
@@ -46,7 +46,7 @@ export default applyScalars(
             'EMOTED',
             'NOTIFIED',
             'REPORTED',
-            'DECIDED',
+            'REVIEWED',
             'Donations',
           ],
           // add 'User' here as soon as possible
diff --git a/backend/src/schema/resolvers/comments.js b/backend/src/schema/resolvers/comments.js
index 83816117e..b11d78301 100644
--- a/backend/src/schema/resolvers/comments.js
+++ b/backend/src/schema/resolvers/comments.js
@@ -69,8 +69,35 @@ export default {
       hasOne: {
         author: '<-[:WROTE]-(related:User)',
         post: '-[:COMMENTS]->(related:Post)',
-        decidedByModerator: '<-[:DECIDED]-(related:User)',
+        // Wolle reviewedByModerator: '<-[:DECIDED]-(related:User)',
       },
     }),
+    // Wolle reviewedByModerator: async (parent, params, context, resolveInfo) => {
+    //   console.log('reviewedByModerator !!!')
+    //   console.log('reviewedByModerator !!!')
+    //   console.log('reviewedByModerator !!!')
+    //   console.log('reviewedByModerator !!!')
+    //   console.log('reviewedByModerator !!!')
+    //   if (typeof parent.reviewedByModerator !== 'undefined') return parent.reviewedByModerator
+    //   // const { id } = parent
+    //   // const statement = `
+    //   // MATCH (p:Post {id: $id})-[:TAGGED|CATEGORIZED]->(categoryOrTag)<-[:TAGGED|CATEGORIZED]-(post:Post)
+    //   // WHERE NOT post.deleted AND NOT post.disabled
+    //   // RETURN DISTINCT post
+    //   // LIMIT 10
+    //   // `
+    //   // let reviewedByModerator
+    //   // const session = context.driver.session()
+    //   // try {
+    //   //   const result = await session.run(statement, { id })
+    //   //   relatedContributions = result.records.map(r => r.get('post').properties)
+    //   // } finally {
+    //   //   session.close()
+    //   // }
+    //   // return reviewedByModerator
+    //   return {
+    //     id: 'Hallo !!!'
+    //   }
+    // },
   },
 }
diff --git a/backend/src/schema/resolvers/moderation.js b/backend/src/schema/resolvers/moderation.js
index 7876439d0..fa1704603 100644
--- a/backend/src/schema/resolvers/moderation.js
+++ b/backend/src/schema/resolvers/moderation.js
@@ -1,33 +1,32 @@
 import uuid from 'uuid/v4'
 import { undefinedToNullResolver } from './helpers/Resolver'
 
-const queryOpenDecisionWriteTransaction = (session, resourceId) => {
-  return session.writeTransaction(async txc => {
-    const queryOpenDecisionTransactionResponse = await txc.run(
-      `
-        //MATCH (moderator:User)-[decision:DECIDED {closed: false}]->(resource {id: $resourceId})
-        //WHERE resource:User OR resource:Comment OR resource:Post
-        //RETURN decision, moderator {.id} AS decisionModerator
+// const queryOpenDecisionWriteTransaction = (session, resourceId) => {
+//   return session.writeTransaction(async txc => {
+//     const queryOpenDecisionTransactionResponse = await txc.run(
+//       `
+//         //MATCH (moderator:User)-[decision:DECIDED {closed: false}]->(resource {id: $resourceId})
+//         //WHERE resource:User OR resource:Comment OR resource:Post
+//         //RETURN decision, moderator {.id} AS decisionModerator
 
-        // Wolle only review on reported resources
+//         // Wolle only review on reported resources
 
-        MATCH (moderator:User)-[:REPORTED]->(caseFolder:CaseFolder {closed: false})-[:FLAGGED]->(resource {id: $resourceId})
-        WHERE resource:User OR resource:Post OR resource:Comment
-        RETURN caseFolder, moderator {.id} AS caseModerator
-      `,
-      { resourceId },
-    )
-    return queryOpenDecisionTransactionResponse.records.map(record => ({
-      caseFolder: record.get('caseFolder'),
-      caseModerator: record.get('caseModerator'),
-    }))
-  })
-}
+//         MATCH (caseModerator:User)-[:REPORTED]->(caseFolder:CaseFolder {closed: false})-[:FLAGGED]->(resource {id: $resourceId})
+//         WHERE resource:User OR resource:Post OR resource:Comment
+//         RETURN caseFolder, caseModerator {.id}
+//       `,
+//       { resourceId },
+//     )
+//     return queryOpenDecisionTransactionResponse.records.map(record => ({
+//       caseFolder: record.get('caseFolder'),
+//       caseModerator: record.get('caseModerator'),
+//     }))
+//   })
+// }
 
 export default {
   Mutation: {
     decide: async (_object, params, context, _resolveInfo) => {
-      let createdRelationshipWithNestedAttributes = null
       // Wolle console.log('params: ', params)
       const { resourceId } = params
       // Wolle console.log('resourceId: ', resourceId)
@@ -35,101 +34,161 @@ export default {
       // Wolle console.log('disable: ', disable)
       const { user: moderator, driver } = context
 
+      let createdRelationshipWithNestedAttributes = null  // return value
+
       const session = driver.session()
       try {
-        const queryOpenDecisionWriteTxResultPromise = queryOpenDecisionWriteTransaction(
-          session,
-          resourceId,
-        )
-        const [openDecisionTxResult] = await queryOpenDecisionWriteTxResultPromise
+        // const queryOpenDecisionWriteTxResultPromise = queryOpenDecisionWriteTransaction(
+        //   session,
+        //   resourceId,
+        // )
+        // console.log('queryOpenDecisionWriteTxResultPromise: ', queryOpenDecisionWriteTxResultPromise)
+        // console.log('queryOpenDecisionWriteTxResultPromise: ', queryOpenDecisionWriteTxResultPromise)
+        // console.log('queryOpenDecisionWriteTxResultPromise: ', queryOpenDecisionWriteTxResultPromise)
+        // console.log('queryOpenDecisionWriteTxResultPromise: ', queryOpenDecisionWriteTxResultPromise)
+        // console.log('queryOpenDecisionWriteTxResultPromise: ', queryOpenDecisionWriteTxResultPromise)
+        // const [openDecisionTxResult] = await queryOpenDecisionWriteTxResultPromise
 
-        let cypherHeader = ''
+        // let cypherHeader = ''
 
-        if (!openDecisionTxResult) {
-          // no open caseFolder, then create one
-          if (disable === undefined) disable = false // default for creation
-          if (closed === undefined) closed = false // default for creation
-          cypherHeader = `
-              MATCH (resource {id: $resourceId})
-              WHERE resource: User OR resource: Comment OR resource: Post
-              OPTIONAL MATCH (:User)-[lastDecision:DECIDED {latest: true}]->(resource)
-              SET (CASE WHEN lastDecision IS NOT NULL THEN lastDecision END).latest = false
-              WITH resource
-              MATCH (moderator:User {id: $moderatorId})
-              CREATE (resource)<-[decision:DECIDED]-(moderator)
-              SET decision.latest = true
-              `
-        } else {
-          // an open caseFolder, then change it
-          if (disable === undefined) disable = openDecisionTxResult.caseFolder.properties.disable // default set to existing
-          if (closed === undefined) closed = openDecisionTxResult.caseFolder.properties.closed // default set to existing
-          // current moderator is not the same as old
-          if (moderator.id !== openDecisionTxResult.caseModerator.id) {
-            // from a different moderator, then create relation with properties to new moderator
-            cypherHeader = `
-                MATCH (moderator:User)-[oldDecision:DECIDED {closed: false}]->(resource {id: $resourceId})
-                WHERE resource:User OR resource:Comment OR resource:Post
-                DELETE oldDecision
-                MATCH (moderator:User {id: $moderatorId})
-                MATCH (resource {id: $resourceId})
-                WHERE resource:User OR resource:Comment OR resource:Post
-                CREATE (resource)<-[decision:DECIDED]-(moderator)
-                SET decision = oldDecision
-              `
-          } else {
-            // an open caseFolder from same moderator, then match this
-            cypherHeader = `
-                MATCH (moderator:User)-[decision:DECIDED {closed: false}]->(resource {id: $resourceId})
-                WHERE resource:User OR resource:Comment OR resource:Post
-              `
-          }
-        }
-        let decisionUUID = null
-        let cypherClosed = ''
-        if (closed) {
-          decisionUUID = uuid()
-          cypherClosed = `
-              WITH decision, resource, moderator
-              OPTIONAL MATCH (:User)-[report:REPORTED {closed: false}]->(resource)
-              SET (CASE WHEN report IS NOT NULL THEN report END).closed = true
-              SET (CASE WHEN report IS NOT NULL THEN report END).decisionUuid = $decisionUUID
-              SET decision.uuid = $decisionUUID
-            `
-        }
+        // // Wolle openDecisionTxResult should not be undefined !!!
+        // if (!openDecisionTxResult) {
+        //   // no open caseFolder, then create one
+        //   if (disable === undefined) disable = false // default for creation
+        //   if (closed === undefined) closed = false // default for creation
+        //   cypherHeader = `
+        //       MATCH (resource {id: $resourceId})
+        //       WHERE resource: User OR resource: Comment OR resource: Post
+        //       OPTIONAL MATCH (:User)-[lastDecision:DECIDED {latest: true}]->(resource)
+        //       SET (CASE WHEN lastDecision IS NOT NULL THEN lastDecision END).latest = false
+        //       WITH resource
+        //       MATCH (moderator:User {id: $moderatorId})
+        //       CREATE (resource)<-[decision:DECIDED]-(moderator)
+        //       SET decision.latest = true
+        //       `
+        // } else {
+        //   // an open caseFolder, then change it
+        //   if (disable === undefined) disable = openDecisionTxResult.caseFolder.properties.disable // default set to existing
+        //   if (closed === undefined) closed = openDecisionTxResult.caseFolder.properties.closed // default set to existing
+        //   // current moderator is not the same as old
+        //   if (moderator.id !== openDecisionTxResult.caseModerator.id) {
+        //     // from a different moderator, then create relation with properties to new moderator
+        //     cypherHeader = `
+        //         MATCH (moderator:User)-[oldDecision:DECIDED {closed: false}]->(resource {id: $resourceId})
+        //         WHERE resource:User OR resource:Comment OR resource:Post
+        //         DELETE oldDecision
+        //         MATCH (moderator:User {id: $moderatorId})
+        //         MATCH (resource {id: $resourceId})
+        //         WHERE resource:User OR resource:Comment OR resource:Post
+        //         CREATE (resource)<-[decision:DECIDED]-(moderator)
+        //         SET decision = oldDecision
+        //       `
+        //   } else {
+        //     // an open caseFolder from same moderator, then match this
+        //     cypherHeader = `
+        //         MATCH (moderator:User)-[decision:DECIDED {closed: false}]->(resource {id: $resourceId})
+        //         WHERE resource:User OR resource:Comment OR resource:Post
+        //       `
+        //   }
+        // }
+        // let decisionUUID = null
+        // let cypherClosed = ''
+        // if (closed) {
+        //   decisionUUID = uuid()
+        //   cypherClosed = `
+        //       WITH decision, resource, moderator
+        //       OPTIONAL MATCH (:User)-[report:REPORTED {closed: false}]->(resource)
+        //       SET (CASE WHEN report IS NOT NULL THEN report END).closed = true
+        //       SET (CASE WHEN report IS NOT NULL THEN report END).decisionUuid = $decisionUUID
+        //       SET decision.uuid = $decisionUUID
+        //     `
+        // }
+        // const cypher =
+        //   cypherHeader +
+        //   `SET decision.updatedAt = toString(datetime())
+        //     SET (CASE WHEN decision.createdAt IS NULL THEN decision END).createdAt = decision.updatedAt
+        //     SET decision.disable = $disable, decision.closed = $closed
+        //     SET resource.disabled = $disable
+        //   ` +
+        //   cypherClosed +
+        //   `RETURN decision, resource, moderator, labels(resource)[0] AS type
+        //   `
         const cypher =
-          cypherHeader +
-          `SET decision.updatedAt = toString(datetime())
-            SET (CASE WHEN decision.createdAt IS NULL THEN decision END).createdAt = decision.updatedAt
-            SET decision.disable = $disable, decision.closed = $closed
+          ` 
+            // Wolle only review on reported resources
+
+            MATCH (moderator:User {id: $moderatorId})
+            MATCH (resource {id: $resourceId})
+            WHERE resource:User OR resource:Post OR resource:Comment
+
+            // no open caseFolder, create one, update existing
+            MERGE (resource)<-[:FLAGGED]-(caseFolder:CaseFolder {closed: false})
+            ON CREATE SET caseFolder.id = randomUUID(), caseFolder.createdAt = $createdAt, caseFolder.updatedAt = caseFolder.createdAt, caseFolder.disable = $disable, caseFolder.closed = $closed
+            ON MATCH SET caseFolder.updatedAt = $createdAt, caseFolder.disable = $disable, caseFolder.closed = $closed
+
+            // Create review on caseFolder
+            WITH moderator, resource, caseFolder
+            CREATE (caseFolder)<-[review:REVIEWED {createdAt: $createdAt, updatedAt: $createdAt, disable: $disable, closed: $closed}]-(moderator)
+
             SET resource.disabled = $disable
-          ` +
-          cypherClosed +
-          `RETURN decision, resource, moderator, labels(resource)[0] AS type
+
+            RETURN moderator, review, caseFolder {.id}, resource, labels(resource)[0] AS type
+
+            //RETURN decision, resource, moderator, labels(resource)[0] AS type
           `
+
         // Wolle console.log('cypher: ', cypher)
         // console.log('disable: ', disable)
 
+        // const mutateDecisionWriteTxResultPromise = session.writeTransaction(async txc => {
+        //   const mutateDecisionTransactionResponse = await txc.run(
+        //     cypher, {
+        //     resourceId,
+        //     moderatorId: moderator.id,
+        //     disable,
+        //     closed,
+        //     decisionUUID,
+        //   })
+        //   return mutateDecisionTransactionResponse.records.map(record => ({
+        //     decision: record.get('decision'),
+        //     resource: record.get('resource'),
+        //     moderator: record.get('moderator'),
+        //     type: record.get('type'),
+        //   }))
+        // })
         const mutateDecisionWriteTxResultPromise = session.writeTransaction(async txc => {
-          const mutateDecisionTransactionResponse = await txc.run(cypher, {
+          const mutateDecisionTransactionResponse = await txc.run(
+            cypher, {
             resourceId,
             moderatorId: moderator.id,
+            createdAt: new Date().toISOString(),
             disable,
             closed,
-            decisionUUID,
           })
           return mutateDecisionTransactionResponse.records.map(record => ({
-            decision: record.get('decision'),
-            resource: record.get('resource'),
             moderator: record.get('moderator'),
+            review: record.get('review'),
+            caseFolder: record.get('caseFolder'),
+            resource: record.get('resource'),
             type: record.get('type'),
           }))
         })
         const txResult = await mutateDecisionWriteTxResultPromise
         if (!txResult[0]) return null
-        const { decision, resource, moderator: moderatorInResult, type } = txResult[0]
+        // const { decision, resource, moderator: moderatorInResult, type } = txResult[0]
+        // createdRelationshipWithNestedAttributes = {
+        //   ...decision.properties,
+        //   moderator: moderatorInResult.properties,
+        //   type,
+        //   post: null,
+        //   comment: null,
+        //   user: null,
+        // }
+        const { moderator: moderatorInResult, review, caseFolder, resource, type } = txResult[0]
         createdRelationshipWithNestedAttributes = {
-          ...decision.properties,
+          ...review.properties,
           moderator: moderatorInResult.properties,
+          caseFolderId: caseFolder.id,
           type,
           post: null,
           comment: null,
@@ -153,7 +212,7 @@ export default {
       return createdRelationshipWithNestedAttributes
     },
   },
-  DECIDED: {
-    ...undefinedToNullResolver(['uuid']),
+  REVIEWED: {
+    // Wolle ...undefinedToNullResolver(['uuid']),
   },
 }
diff --git a/backend/src/schema/resolvers/moderation.spec.js b/backend/src/schema/resolvers/moderation.spec.js
index 31014224e..4e082a3e0 100644
--- a/backend/src/schema/resolvers/moderation.spec.js
+++ b/backend/src/schema/resolvers/moderation.spec.js
@@ -34,7 +34,7 @@ const commentQuery = gql`
     Comment(id: $id) {
       id
       disabled
-      decidedByModerator {
+      reviewedByModerator {
         id
       }
     }
@@ -45,7 +45,7 @@ const postQuery = gql`
     Post(id: $id) {
       id
       disabled
-      decidedByModerator {
+      reviewedByModerator {
         id
       }
     }
@@ -172,7 +172,7 @@ describe('moderate resources', () => {
             })
           })
 
-          it('changes .decidedByModerator', async () => {
+          it('changes .reviewedByModerator', async () => {
             resourceVariables = {
               id: 'comment-id',
             }
@@ -180,9 +180,9 @@ describe('moderate resources', () => {
               ...disableVariables,
               resourceId: 'comment-id',
             }
-            const before = { data: { Comment: [{ id: 'comment-id', decidedByModerator: null }] } }
+            const before = { data: { Comment: [{ id: 'comment-id', reviewedByModerator: null }] } }
             const expected = {
-              data: { Comment: [{ id: 'comment-id', decidedByModerator: { id: 'moderator-id' } }] },
+              data: { Comment: [{ id: 'comment-id', reviewedByModerator: { id: 'moderator-id' } }] },
             }
             await expect(
               query({ query: commentQuery, variables: resourceVariables }),
@@ -241,7 +241,7 @@ describe('moderate resources', () => {
             })
           })
 
-          it('changes .decidedByModerator', async () => {
+          it('changes .reviewedByModerator', async () => {
             resourceVariables = {
               id: 'sample-post-id',
             }
@@ -249,10 +249,10 @@ describe('moderate resources', () => {
               ...disableVariables,
               resourceId: 'sample-post-id',
             }
-            const before = { data: { Post: [{ id: 'sample-post-id', decidedByModerator: null }] } }
+            const before = { data: { Post: [{ id: 'sample-post-id', reviewedByModerator: null }] } }
             const expected = {
               data: {
-                Post: [{ id: 'sample-post-id', decidedByModerator: { id: 'moderator-id' } }],
+                Post: [{ id: 'sample-post-id', reviewedByModerator: { id: 'moderator-id' } }],
               },
             }
 
@@ -387,9 +387,9 @@ describe('moderate resources', () => {
             })
           })
 
-          it('changes .decidedByModerator', async () => {
+          it('changes .reviewedByModerator', async () => {
             const expected = {
-              data: { Comment: [{ id: 'comment-id', decidedByModerator: { id: 'moderator-id' } }] },
+              data: { Comment: [{ id: 'comment-id', reviewedByModerator: { id: 'moderator-id' } }] },
             }
 
             await expect(
@@ -443,9 +443,9 @@ describe('moderate resources', () => {
             })
           })
 
-          it('changes .decidedByModerator', async () => {
+          it('changes .reviewedByModerator', async () => {
             const expected = {
-              data: { Post: [{ id: 'post-id', decidedByModerator: { id: 'moderator-id' } }] },
+              data: { Post: [{ id: 'post-id', reviewedByModerator: { id: 'moderator-id' } }] },
             }
             await expect(
               mutate({ mutation: decideMutation, variables: enableVariables }),
diff --git a/backend/src/schema/resolvers/posts.js b/backend/src/schema/resolvers/posts.js
index 12e050298..2d60fb697 100644
--- a/backend/src/schema/resolvers/posts.js
+++ b/backend/src/schema/resolvers/posts.js
@@ -307,7 +307,7 @@ export default {
       },
       hasOne: {
         author: '<-[:WROTE]-(related:User)',
-        decidedByModerator: '<-[:DECIDED]-(related:User)',
+        // Wolle reviewedByModerator: '<-[:DECIDED]-(related:User)',
         pinnedBy: '<-[:PINNED]-(related:User)',
       },
       count: {
diff --git a/backend/src/schema/resolvers/users.js b/backend/src/schema/resolvers/users.js
index 0bb921bc4..8ddadc745 100644
--- a/backend/src/schema/resolvers/users.js
+++ b/backend/src/schema/resolvers/users.js
@@ -199,7 +199,7 @@ export default {
       },
       hasOne: {
         invitedBy: '<-[:INVITED]-(related:User)',
-        decidedByModerator: '<-[:DECIDED]-(related:User)',
+        // Wolle reviewedByModerator: '<-[:DECIDED]-(related:User)',
         location: '-[:IS_IN]->(related:Location)',
       },
       hasMany: {
diff --git a/backend/src/schema/types/type/Comment.gql b/backend/src/schema/types/type/Comment.gql
index 4c1b9968e..9604318cf 100644
--- a/backend/src/schema/types/type/Comment.gql
+++ b/backend/src/schema/types/type/Comment.gql
@@ -9,7 +9,16 @@ type Comment {
   updatedAt: String
   deleted: Boolean
   disabled: Boolean
-  decidedByModerator: User @relation(name: "DECIDED", direction: "IN")
+  # Wolle reviewedByModerator: User # Wolle @relation(name: "DECIDED", direction: "IN")
+  reviewedByModerator: User
+    @cypher(
+      statement: """
+      MATCH (this)<-[:FLAGGED]-(caseFolder:CaseFolder)<-[review:REVIEWED]-(moderator:User)
+      RETURN moderator
+      ORDER BY caseFolder.updatedAt ASC, review.updatedAt ASC
+      LIMIT 1
+      """
+    )
 }
 
 type Mutation {
diff --git a/backend/src/schema/types/type/Post.gql b/backend/src/schema/types/type/Post.gql
index 77ec432e2..a79de1d0f 100644
--- a/backend/src/schema/types/type/Post.gql
+++ b/backend/src/schema/types/type/Post.gql
@@ -46,8 +46,16 @@ type Post {
   visibility: Visibility
   deleted: Boolean
   disabled: Boolean
+  reviewedByModerator: User
+    @cypher(
+      statement: """
+      MATCH (this)<-[:FLAGGED]-(caseFolder:CaseFolder)<-[review:REVIEWED]-(moderator:User)
+      RETURN moderator
+      ORDER BY caseFolder.updatedAt ASC, review.updatedAt ASC
+      LIMIT 1
+      """
+    )
   pinned: Boolean
-  decidedByModerator: User @relation(name: "DECIDED", direction: "IN")
   createdAt: String
   updatedAt: String
   language: String
diff --git a/backend/src/schema/types/type/DECIDED.gql b/backend/src/schema/types/type/REVIEWED.gql
similarity index 54%
rename from backend/src/schema/types/type/DECIDED.gql
rename to backend/src/schema/types/type/REVIEWED.gql
index 0c56a9896..d3f064436 100644
--- a/backend/src/schema/types/type/DECIDED.gql
+++ b/backend/src/schema/types/type/REVIEWED.gql
@@ -1,25 +1,25 @@
-type DECIDED {
+type REVIEWED {
   createdAt: String!
   updatedAt: String!
   # reasonCategory: ReasonCategory
   # reasonDescription: String
   disable: Boolean!
   closed: Boolean!
-  uuid: ID
-  last: Boolean!
+  caseFolderId: ID!
+  # Wolle last: Boolean!
   
   moderator: User
-    @cypher(statement: "MATCH (resource)<-[:DECIDED]-(moderator:User) RETURN moderator")
+    # @cypher(statement: "MATCH (resource)<-[:DECIDED]-(moderator:User) RETURN moderator")
   # not yet supported
   # resource: ReportResource
   #   @cypher(statement: "MATCH (resource)<-[:DECIDED]-(:User) RETURN resource")
   type: String
-    @cypher(statement: "MATCH (resource)<-[:DECIDED]-(user:User) RETURN labels(resource)[0]")
+    # @cypher(statement: "MATCH (resource)<-[:DECIDED]-(user:User) RETURN labels(resource)[0]")
   user: User
   post: Post
   comment: Comment
 }
 
 type Mutation {
-  decide(resourceId: ID!, disable: Boolean, closed: Boolean): DECIDED
+  decide(resourceId: ID!, disable: Boolean, closed: Boolean): REVIEWED
 }
diff --git a/backend/src/schema/types/type/User.gql b/backend/src/schema/types/type/User.gql
index ebe9c2a3c..cd5906229 100644
--- a/backend/src/schema/types/type/User.gql
+++ b/backend/src/schema/types/type/User.gql
@@ -8,7 +8,15 @@ type User {
   coverImg: String
   deleted: Boolean
   disabled: Boolean
-  decidedByModerator: User @relation(name: "DECIDED", direction: "IN")
+  reviewedByModerator: User
+    @cypher(
+      statement: """
+      MATCH (this)<-[:FLAGGED]-(caseFolder:CaseFolder)<-[review:REVIEWED]-(moderator:User)
+      RETURN moderator
+      ORDER BY caseFolder.updatedAt ASC, review.updatedAt ASC
+      LIMIT 1
+      """
+    )
   role: UserGroup!
   publicKey: String
   invitedBy: User @relation(name: "INVITED", direction: "IN")
diff --git a/webapp/graphql/Moderation.js b/webapp/graphql/Moderation.js
index ea2da0df1..f11a52a8a 100644
--- a/webapp/graphql/Moderation.js
+++ b/webapp/graphql/Moderation.js
@@ -29,7 +29,7 @@ export const reportListQuery = () => {
           name
           disabled
           deleted
-          decidedByModerator {
+          reviewedByModerator {
             id
             slug
             name
@@ -60,7 +60,7 @@ export const reportListQuery = () => {
             disabled
             deleted
           }
-          decidedByModerator {
+          reviewedByModerator {
             id
             slug
             name
@@ -84,7 +84,7 @@ export const reportListQuery = () => {
             contributionsCount
             commentedCount
           }
-          decidedByModerator {
+          reviewedByModerator {
             id
             slug
             name
diff --git a/webapp/pages/moderation/index.vue b/webapp/pages/moderation/index.vue
index 77d3ecc73..033a617b1 100644
--- a/webapp/pages/moderation/index.vue
+++ b/webapp/pages/moderation/index.vue
@@ -101,8 +101,8 @@
               >
                 {{ $t('moderation.reports.decideButton') }}
               </ds-button>
-              <!-- decidedByModerator -->
-              <div v-if="content.resource.decidedByModerator">
+              <!-- reviewedByModerator -->
+              <div v-if="content.resource.reviewedByModerator">
                 <br />
                 <div v-if="content.caseFolderDisable">
                   <ds-icon name="eye-slash" class="ban" />
@@ -113,7 +113,7 @@
                   {{ $t('moderation.reports.enabledBy') }}
                 </div>
                 <hc-user
-                  :user="content.resource.decidedByModerator"
+                  :user="content.resource.reviewedByModerator"
                   :showAvatar="false"
                   :trunc="30"
                   :date-time="content.caseFolderUpdatedAt"

From 0fdd46b6568eb6426b86ce74555f12f68fad1b4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Wed, 20 Nov 2019 15:30:37 +0100
Subject: [PATCH 045/174] Implement CaseFolder property rule

---
 backend/src/schema/resolvers/moderation.js         | 3 ++-
 backend/src/schema/resolvers/reports.js            | 2 +-
 backend/src/schema/types/type/CaseFolder.gql       | 5 +++++
 neo4j/change_disabled_relationship_to_case_node.sh | 8 ++++----
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/backend/src/schema/resolvers/moderation.js b/backend/src/schema/resolvers/moderation.js
index fa1704603..eabc22af6 100644
--- a/backend/src/schema/resolvers/moderation.js
+++ b/backend/src/schema/resolvers/moderation.js
@@ -120,10 +120,11 @@ export default {
             MATCH (moderator:User {id: $moderatorId})
             MATCH (resource {id: $resourceId})
             WHERE resource:User OR resource:Post OR resource:Comment
+            //WHERE (caseFolder)<-[report:REPORTED]-(submitter:User)
 
             // no open caseFolder, create one, update existing
             MERGE (resource)<-[:FLAGGED]-(caseFolder:CaseFolder {closed: false})
-            ON CREATE SET caseFolder.id = randomUUID(), caseFolder.createdAt = $createdAt, caseFolder.updatedAt = caseFolder.createdAt, caseFolder.disable = $disable, caseFolder.closed = $closed
+            ON CREATE SET caseFolder.id = randomUUID(), caseFolder.createdAt = $createdAt, caseFolder.updatedAt = caseFolder.createdAt, caseFolder.rule = 'latestReviewUpdatedAt', caseFolder.disable = $disable, caseFolder.closed = $closed
             ON MATCH SET caseFolder.updatedAt = $createdAt, caseFolder.disable = $disable, caseFolder.closed = $closed
 
             // Create review on caseFolder
diff --git a/backend/src/schema/resolvers/reports.js b/backend/src/schema/resolvers/reports.js
index 478376161..8e187df2b 100644
--- a/backend/src/schema/resolvers/reports.js
+++ b/backend/src/schema/resolvers/reports.js
@@ -15,7 +15,7 @@ export default {
             WHERE resource:User OR resource:Post OR resource:Comment
             // no open caseFolder, create one
             MERGE (resource)<-[:FLAGGED]-(caseFolder:CaseFolder {closed: false})
-            ON CREATE SET caseFolder.id = randomUUID(), caseFolder.createdAt = $createdAt, caseFolder.updatedAt = caseFolder.createdAt, caseFolder.disable = false, caseFolder.closed = false
+            ON CREATE SET caseFolder.id = randomUUID(), caseFolder.createdAt = $createdAt, caseFolder.updatedAt = caseFolder.createdAt, caseFolder.rule = 'latestReviewUpdatedAt', caseFolder.disable = false, caseFolder.closed = false
             // Create report on caseFolder
             WITH submitter, resource, caseFolder
             CREATE (caseFolder)<-[report:REPORTED {createdAt: $createdAt, reasonCategory: $reasonCategory, reasonDescription: $reasonDescription}]-(submitter)
diff --git a/backend/src/schema/types/type/CaseFolder.gql b/backend/src/schema/types/type/CaseFolder.gql
index 0e643c9c0..44e9d3664 100644
--- a/backend/src/schema/types/type/CaseFolder.gql
+++ b/backend/src/schema/types/type/CaseFolder.gql
@@ -2,8 +2,13 @@ type CaseFolder {
   id: ID!
   createdAt: String!
   updatedAt: String!
+  rule: CaseRule!
   disable: Boolean!
   # reasonCategory: ReasonCategory!
   # reasonDescription: String!
   closed: Boolean!
 }
+
+enum CaseRule {
+  latestReviewUpdatedAt
+}
diff --git a/neo4j/change_disabled_relationship_to_case_node.sh b/neo4j/change_disabled_relationship_to_case_node.sh
index e24842112..ef7474aa4 100755
--- a/neo4j/change_disabled_relationship_to_case_node.sh
+++ b/neo4j/change_disabled_relationship_to_case_node.sh
@@ -22,7 +22,7 @@ WHERE disabledResource:User OR disabledResource:Comment OR disabledResource:Post
 DELETE disabled
 CREATE (moderator)-[review:REVIEWED]->(caseFolder:CaseFolder)-[:FLAGGED]->(disabledResource)
 SET review.createdAt = toString(datetime()), review.updatedAt = review.createdAt, review.disable = true
-SET caseFolder.id = randomUUID(), caseFolder.createdAt = toString(datetime()), caseFolder.updatedAt = caseFolder.createdAt, caseFolder.disable = true, caseFolder.closed = false
+SET caseFolder.id = randomUUID(), caseFolder.createdAt = toString(datetime()), caseFolder.updatedAt = caseFolder.createdAt, caseFolder.rule = 'latestReviewUpdatedAt', caseFolder.disable = true, caseFolder.closed = false
 
 // if disabledResource has no report, then create a moderators default report
 WITH moderator, disabledResource, caseFolder
@@ -44,9 +44,9 @@ echo "
 // for REPORTED resources without DISABLED relation which are handled above, create new REPORTED-CaseFolder-FLAGGED structure
 MATCH (reporter:User)-[oldReport:REPORTED]->(notDisabledResource)
 WHERE notDisabledResource:User OR notDisabledResource:Comment OR notDisabledResource:Post
-CREATE (reporter)-[report:REPORTED]->(caseFolder:CaseFolder)
-MERGE (caseFolder)-[:FLAGGED]->(notDisabledResource)
-ON CREATE SET caseFolder.id = randomUUID(), caseFolder.createdAt = toString(datetime()), caseFolder.updatedAt = caseFolder.createdAt, caseFolder.disable = false, caseFolder.closed = false
+MERGE (caseFolder:CaseFolder)-[:FLAGGED]->(notDisabledResource)
+ON CREATE SET caseFolder.id = randomUUID(), caseFolder.createdAt = toString(datetime()), caseFolder.updatedAt = caseFolder.createdAt, caseFolder.rule = 'latestReviewUpdatedAt', caseFolder.disable = false, caseFolder.closed = false
+CREATE (reporter)-[report:REPORTED]->(caseFolder)
 SET report = oldReport
 DELETE oldReport
 

From 6d9e6e7f0a94ca5d7bb4a35fa46ea60fcee8423c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Wed, 20 Nov 2019 16:21:01 +0100
Subject: [PATCH 046/174] Get frontend runnig with new CaseFolder structure
 first try

---
 backend/src/schema/resolvers/moderation.js    | 10 ++++------
 .../src/schema/resolvers/moderation.spec.js   |  8 ++++++--
 backend/src/schema/resolvers/reports.js       | 19 +++++++++++--------
 3 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/backend/src/schema/resolvers/moderation.js b/backend/src/schema/resolvers/moderation.js
index eabc22af6..a691fd477 100644
--- a/backend/src/schema/resolvers/moderation.js
+++ b/backend/src/schema/resolvers/moderation.js
@@ -30,11 +30,11 @@ export default {
       // Wolle console.log('params: ', params)
       const { resourceId } = params
       // Wolle console.log('resourceId: ', resourceId)
-      let { disable, closed } = params
+      const { disable, closed } = params
       // Wolle console.log('disable: ', disable)
       const { user: moderator, driver } = context
 
-      let createdRelationshipWithNestedAttributes = null  // return value
+      let createdRelationshipWithNestedAttributes = null // return value
 
       const session = driver.session()
       try {
@@ -113,8 +113,7 @@ export default {
         //   cypherClosed +
         //   `RETURN decision, resource, moderator, labels(resource)[0] AS type
         //   `
-        const cypher =
-          ` 
+        const cypher = ` 
             // Wolle only review on reported resources
 
             MATCH (moderator:User {id: $moderatorId})
@@ -158,8 +157,7 @@ export default {
         //   }))
         // })
         const mutateDecisionWriteTxResultPromise = session.writeTransaction(async txc => {
-          const mutateDecisionTransactionResponse = await txc.run(
-            cypher, {
+          const mutateDecisionTransactionResponse = await txc.run(cypher, {
             resourceId,
             moderatorId: moderator.id,
             createdAt: new Date().toISOString(),
diff --git a/backend/src/schema/resolvers/moderation.spec.js b/backend/src/schema/resolvers/moderation.spec.js
index 4e082a3e0..37197ffc4 100644
--- a/backend/src/schema/resolvers/moderation.spec.js
+++ b/backend/src/schema/resolvers/moderation.spec.js
@@ -182,7 +182,9 @@ describe('moderate resources', () => {
             }
             const before = { data: { Comment: [{ id: 'comment-id', reviewedByModerator: null }] } }
             const expected = {
-              data: { Comment: [{ id: 'comment-id', reviewedByModerator: { id: 'moderator-id' } }] },
+              data: {
+                Comment: [{ id: 'comment-id', reviewedByModerator: { id: 'moderator-id' } }],
+              },
             }
             await expect(
               query({ query: commentQuery, variables: resourceVariables }),
@@ -389,7 +391,9 @@ describe('moderate resources', () => {
 
           it('changes .reviewedByModerator', async () => {
             const expected = {
-              data: { Comment: [{ id: 'comment-id', reviewedByModerator: { id: 'moderator-id' } }] },
+              data: {
+                Comment: [{ id: 'comment-id', reviewedByModerator: { id: 'moderator-id' } }],
+              },
             }
 
             await expect(
diff --git a/backend/src/schema/resolvers/reports.js b/backend/src/schema/resolvers/reports.js
index 8e187df2b..fca881d51 100644
--- a/backend/src/schema/resolvers/reports.js
+++ b/backend/src/schema/resolvers/reports.js
@@ -20,7 +20,7 @@ export default {
             WITH submitter, resource, caseFolder
             CREATE (caseFolder)<-[report:REPORTED {createdAt: $createdAt, reasonCategory: $reasonCategory, reasonDescription: $reasonDescription}]-(submitter)
 
-            RETURN submitter, report, caseFolder {.id}, resource, labels(resource)[0] AS type
+            RETURN submitter, report, caseFolder, resource, labels(resource)[0] AS type
           `,
           {
             resourceId,
@@ -44,7 +44,10 @@ export default {
         const { submitter, report, caseFolder, resource, type } = txResult[0]
         createdRelationshipWithNestedAttributes = {
           ...report.properties,
-          caseFolderId: caseFolder.id,
+          caseFolderId: caseFolder.properties.id,
+          caseFolderUpdatedAt: caseFolder.properties.updatedAt,
+          caseFolderDisable: caseFolder.properties.disable,
+          caseFolderClosed: caseFolder.properties.closed,
           post: null,
           comment: null,
           user: null,
@@ -106,14 +109,14 @@ export default {
 
         response = []
         dbResponse.forEach(ele => {
-          const { report, submitter, caseFolder, resource, type, decision, decisionPending } = ele
+          const { report, submitter, caseFolder, resource, type } = ele
 
           const responseEle = {
             ...report.properties,
-            caseFolderId: caseFolder.id,
-            caseFolderUpdatedAt: caseFolder.updatedAt,
-            caseFolderDisable: caseFolder.disable,
-            caseFolderClosed: caseFolder.closed,
+            caseFolderId: caseFolder.properties.id,
+            caseFolderUpdatedAt: caseFolder.properties.updatedAt,
+            caseFolderDisable: caseFolder.properties.disable,
+            caseFolderClosed: caseFolder.properties.closed,
             post: null,
             comment: null,
             user: null,
@@ -151,6 +154,6 @@ export default {
     },
   },
   REPORTED: {
-    // Wolle ...undefinedToNullResolver(['decisionUuid', 'decisionAt', 'decisionDisable']),
+    // Wolle ...undefinedToNullResolver(['caseFolderId', 'caseFolderDisable', 'caseFolderUpdatedAt', 'caseFolderClosed']),
   },
 }

From b360f71112f2f5d1b08a4c19f0a36ad8da9878ab Mon Sep 17 00:00:00 2001
From: ogerly <landmatrosen@googlemail.com>
Date: Thu, 21 Nov 2019 10:16:10 +0100
Subject: [PATCH 047/174] Terms of use extended with dot - no commercial use

---
 webapp/locales/de.json                | 4 ++++
 webapp/locales/en.json                | 4 ++++
 webapp/pages/terms-and-conditions.vue | 1 +
 3 files changed, 9 insertions(+)

diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index edb194fec..bdc430227 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -726,6 +726,10 @@
       "title": " Fehler und Feedback",
       "description": "Wir geben uns größte Mühe, unser Netzwerk und die Daten sicher und verfügbar zu halten. Jedes neue Release der Software durchläuft sowohl automatisierte und händische Tests. Trotzdem kann es passieren, dass unvorhergesehene Fehler auftreten. Daher sind wir dankbar für jeden gemeldeten Fehler. Du kannst von Dir entdeckte Fehler gerne per E-Mail an den Support mitteilen: support@human-connection.org"
     },
+    "no-commercial-use" : {
+      "title": "Keine kommerzielle Nutzung",
+      "description": "Die Nutzung des Human Connection Netzwerkes ist nicht gestattet für kommerzielle Nutzung. Darunter fällt unter anderem das Bewerben von Produkten mit kommerzieller Absicht, das Einstellen von Affiliate-Links, direkter Aufruf zu Spenden oder finanzieller Unterstützung für Zwecke, die steuerlich nicht als gemeinnützig anerkannt sind."
+    },
     "help-and-questions" : {
       "title": "Hilfe und Fragen",
       "description": "Für Hilfe und Fragen haben wir für Dich eine umfassende Sammlung an immer wieder gestellten Fragen bzw. Antworten (FAQ) zusammengestellt. Du findest diese hier: <a href=\"https://support.human-connection.org/kb/\" target=\"_blank\" > https://support.human-connection.org/kb/ </a>"
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index c34bb27d0..474a2a983 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -727,6 +727,10 @@
       "title": "Errors and Feedback",
       "description": "We make every effort to keep our network and data secure and available. Each new release of the software goes through both automated and manual testing. However, unforeseen errors may occur. Therefore, we are grateful for any reported bugs. You are welcome to report any bugs you discover by emailing Support at support@human-connection.org"
     },
+    "no-commercial-use" : {
+      "title": "No Commercial Use",
+      "description": "The use of the Human Connection Network is not permitted for commercial purposes. This includes, but is not limited to, advertising products with commercial intent, posting affiliate links, directly soliciting donations, or providing financial support for purposes that are not recognized as charitable for tax purposes."
+    },
     "help-and-questions" : {
       "title": "Help and Questions",
       "description": "For help and questions we have compiled a comprehensive collection of frequently asked questions and answers (FAQ) for you. You can find them here: <a href=\"https://support.human-connection.org/kb/\" target=\"_blank\" > https://support.human-connection.org/kb/ </a>"
diff --git a/webapp/pages/terms-and-conditions.vue b/webapp/pages/terms-and-conditions.vue
index 10d805710..81e55f6aa 100644
--- a/webapp/pages/terms-and-conditions.vue
+++ b/webapp/pages/terms-and-conditions.vue
@@ -34,6 +34,7 @@ export default {
         'code-of-conduct',
         'moderation',
         'errors-and-feedback',
+        'no-commercial-use',
         'help-and-questions',
         'addition',
       ],

From c0fb53c2b5b8160758c4356ba7110adfb29a9687 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 21 Nov 2019 09:05:54 +0100
Subject: [PATCH 048/174] Get frontend running by start implementing
 'reviewedByModerator' right

---
 backend/src/schema/index.js                |  1 +
 backend/src/schema/resolvers/comments.js   |  4 +-
 backend/src/schema/resolvers/moderation.js |  5 +-
 backend/src/schema/resolvers/posts.js      | 21 ++++++-
 backend/src/schema/resolvers/reports.js    |  2 +-
 backend/src/schema/resolvers/users.js      |  4 +-
 backend/src/schema/types/type/Comment.gql  | 69 +++++-----------------
 backend/src/schema/types/type/Post.gql     | 27 ++++++---
 backend/src/schema/types/type/User.gql     | 17 +++++-
 9 files changed, 77 insertions(+), 73 deletions(-)

diff --git a/backend/src/schema/index.js b/backend/src/schema/index.js
index 9f5fbc2b7..d1ff7ada0 100644
--- a/backend/src/schema/index.js
+++ b/backend/src/schema/index.js
@@ -20,6 +20,7 @@ export default makeAugmentedSchema({
         'NOTIFIED',
         'REPORTED',
         'REVIEWED',
+        'CaseFolder',
         'Donations',
       ],
     },
diff --git a/backend/src/schema/resolvers/comments.js b/backend/src/schema/resolvers/comments.js
index b11d78301..13d06506e 100644
--- a/backend/src/schema/resolvers/comments.js
+++ b/backend/src/schema/resolvers/comments.js
@@ -69,7 +69,9 @@ export default {
       hasOne: {
         author: '<-[:WROTE]-(related:User)',
         post: '-[:COMMENTS]->(related:Post)',
-        // Wolle reviewedByModerator: '<-[:DECIDED]-(related:User)',
+        // Wolle !!! Following statement is not correct, but the correct (see file 'backend/src/schema/types/type/Comment.gql') makes an error. Should be: '<-[:FLAGGED]-(caseFolder:CaseFolder)<-[review:REVIEWED]-(related:User) RETURN related ORDER BY caseFolder.updatedAt ASC, review.updatedAt ASC LIMIT 1'
+        // Wolle reviewedByModerator: '<-[:FLAGGED]-(caseFolder:CaseFolder)<-[review:REVIEWED]-(related:User)',
+        reviewedByModerator: '<-[:FLAGGED]-(caseFolder:CaseFolder)<-[review:REVIEWED]-(related:User) WITH caseFolder, review, related ORDER BY caseFolder.updatedAt ASC, review.updatedAt ASC WITH collect(related) AS orderedRelated WITH orderedRelated[0] AS related',
       },
     }),
     // Wolle reviewedByModerator: async (parent, params, context, resolveInfo) => {
diff --git a/backend/src/schema/resolvers/moderation.js b/backend/src/schema/resolvers/moderation.js
index a691fd477..0debb80ea 100644
--- a/backend/src/schema/resolvers/moderation.js
+++ b/backend/src/schema/resolvers/moderation.js
@@ -1,7 +1,6 @@
-import uuid from 'uuid/v4'
-import { undefinedToNullResolver } from './helpers/Resolver'
+// Wolle import { undefinedToNullResolver } from './helpers/Resolver'
 
-// const queryOpenDecisionWriteTransaction = (session, resourceId) => {
+// Wolle const queryOpenDecisionWriteTransaction = (session, resourceId) => {
 //   return session.writeTransaction(async txc => {
 //     const queryOpenDecisionTransactionResponse = await txc.run(
 //       `
diff --git a/backend/src/schema/resolvers/posts.js b/backend/src/schema/resolvers/posts.js
index b435a0d18..b4eeac489 100644
--- a/backend/src/schema/resolvers/posts.js
+++ b/backend/src/schema/resolvers/posts.js
@@ -307,7 +307,6 @@ export default {
       },
       hasOne: {
         author: '<-[:WROTE]-(related:User)',
-        // Wolle reviewedByModerator: '<-[:DECIDED]-(related:User)',
         pinnedBy: '<-[:PINNED]-(related:User)',
       },
       count: {
@@ -341,5 +340,25 @@ export default {
       }
       return relatedContributions
     },
+    reviewedByModerator: async (parent, params, context, resolveInfo) => {
+      if (typeof parent.reviewedByModerator !== 'undefined') return parent.reviewedByModerator
+      const { id } = parent
+      const statement = `
+        MATCH (p:Post {id: $id})<-[:FLAGGED]-(caseFolder:CaseFolder)<-[review:REVIEWED]-(moderator:User)
+        RETURN moderator
+        ORDER BY caseFolder.updatedAt ASC, review.updatedAt ASC
+        LIMIT 1
+      `
+      let reviewedByModerator
+      const session = context.driver.session()
+      try {
+        const result = await session.run(statement, { id })
+        const [firstElement] = result.records.map(r => r.get('moderator').properties)
+        reviewedByModerator = firstElement 
+      } finally {
+        session.close()
+      }
+      return reviewedByModerator
+    },
   },
 }
diff --git a/backend/src/schema/resolvers/reports.js b/backend/src/schema/resolvers/reports.js
index fca881d51..9eb3c2d12 100644
--- a/backend/src/schema/resolvers/reports.js
+++ b/backend/src/schema/resolvers/reports.js
@@ -1,4 +1,4 @@
-import { undefinedToNullResolver } from './helpers/Resolver'
+// Wolle import { undefinedToNullResolver } from './helpers/Resolver'
 
 export default {
   Mutation: {
diff --git a/backend/src/schema/resolvers/users.js b/backend/src/schema/resolvers/users.js
index ba30afbc6..0fe77c88d 100644
--- a/backend/src/schema/resolvers/users.js
+++ b/backend/src/schema/resolvers/users.js
@@ -200,7 +200,9 @@ export default {
       },
       hasOne: {
         invitedBy: '<-[:INVITED]-(related:User)',
-        // Wolle reviewedByModerator: '<-[:DECIDED]-(related:User)',
+        // Wolle !!! Following statement is not correct, but the correct (see file 'backend/src/schema/types/type/User.gql') makes an error. Should be: '<-[:FLAGGED]-(caseFolder:CaseFolder)<-[review:REVIEWED]-(related:User) RETURN related ORDER BY caseFolder.updatedAt ASC, review.updatedAt ASC LIMIT 1'
+        // Wolle reviewedByModerator: '<-[:FLAGGED]-(caseFolder:CaseFolder)<-[review:REVIEWED]-(related:User)',
+        reviewedByModerator: '<-[:FLAGGED]-(caseFolder:CaseFolder)<-[review:REVIEWED]-(moderators:User) WITH caseFolder, review, moderators ORDER BY caseFolder.updatedAt ASC, review.updatedAt ASC WITH collect(moderators) AS orderedModerators WITH orderedModerators AS related',
         location: '-[:IS_IN]->(related:Location)',
       },
       hasMany: {
diff --git a/backend/src/schema/types/type/Comment.gql b/backend/src/schema/types/type/Comment.gql
index 8c1b8aa58..347b7fc20 100644
--- a/backend/src/schema/types/type/Comment.gql
+++ b/backend/src/schema/types/type/Comment.gql
@@ -1,41 +1,3 @@
-enum _CommentOrdering {
-  id_asc
-  id_desc
-  content_asc
-  content_desc
-  createdAt_asc
-  createdAt_desc
-  updatedAt_asc
-  updatedAt_desc
-}
-
-input _CommentFilter {
-  AND: [_CommentFilter!]
-  OR: [_CommentFilter!]
-  id: ID
-  id_not: ID
-  id_in: [ID!]
-  id_not_in: [ID!]
-  author: _UserFilter
-  author_not: _UserFilter
-  author_in: [_UserFilter!]
-  author_not_in: [_UserFilter!]
-  content: String
-  content_not: String
-  content_in: [String!]
-  content_not_in: [String!]
-  content_contains: String
-  content_not_contains: String
-  content_starts_with: String
-  content_not_starts_with: String
-  content_ends_with: String
-  content_not_ends_with: String
-  post: _PostFilter
-  post_not: _PostFilter
-  post_in: [_PostFilter!]
-  post_not_in: [_PostFilter!]
-}
-
 type Comment {
   id: ID!
   activityId: String
@@ -47,31 +9,28 @@ type Comment {
   updatedAt: String
   deleted: Boolean
   disabled: Boolean
-  # Wolle reviewedByModerator: User # Wolle @relation(name: "DECIDED", direction: "IN")
+  # Wolle reviewedByModerator: User
+    # @cypher(
+    #   statement: """
+    #   MATCH (this)<-[:FLAGGED]-(caseFolder:CaseFolder)<-[review:REVIEWED]-(moderator:User)
+    #   RETURN moderator
+    #   ORDER BY caseFolder.updatedAt ASC, review.updatedAt ASC
+    #   LIMIT 1
+    #   """
+    # )
   reviewedByModerator: User
     @cypher(
       statement: """
-      MATCH (this)<-[:FLAGGED]-(caseFolder:CaseFolder)<-[review:REVIEWED]-(moderator:User)
-      RETURN moderator
+      MATCH (this)<-[:FLAGGED]-(caseFolder:CaseFolder)<-[review:REVIEWED]-(moderators:User)
+      WITH caseFolder, review, moderators
       ORDER BY caseFolder.updatedAt ASC, review.updatedAt ASC
-      LIMIT 1
+      WITH collect(moderators) AS orderedModerators
+      WITH orderedModerators[0] AS moderator
+      RETURN moderator
       """
     )
 }
 
-type Query {
-  Comment(
-    id: ID
-    content: String
-    createdAt: String
-    updatedAt: String
-    first: Int
-    offset: Int
-    orderBy: [_CommentOrdering]
-    filter: _CommentFilter
-  ): [Comment]
-}
-
 type Mutation {
   CreateComment(
     id: ID
diff --git a/backend/src/schema/types/type/Post.gql b/backend/src/schema/types/type/Post.gql
index 6e74ba8dd..915a0ea72 100644
--- a/backend/src/schema/types/type/Post.gql
+++ b/backend/src/schema/types/type/Post.gql
@@ -122,14 +122,25 @@ type Post {
   deleted: Boolean
   disabled: Boolean
   reviewedByModerator: User
-    @cypher(
-      statement: """
-      MATCH (this)<-[:FLAGGED]-(caseFolder:CaseFolder)<-[review:REVIEWED]-(moderator:User)
-      RETURN moderator
-      ORDER BY caseFolder.updatedAt ASC, review.updatedAt ASC
-      LIMIT 1
-      """
-    )
+    # @cypher(
+    #   statement: """
+    #   MATCH (this)<-[:FLAGGED]-(caseFolder:CaseFolder)<-[review:REVIEWED]-(moderator:User)
+    #   RETURN moderator
+    #   ORDER BY caseFolder.updatedAt ASC, review.updatedAt ASC
+    #   LIMIT 1
+    #   """
+    # )
+  # reviewedByModerator: User
+  #   @cypher(
+  #     statement: """
+  #     MATCH (this)<-[:FLAGGED]-(caseFolder:CaseFolder)<-[review:REVIEWED]-(moderators:User)
+  #     WITH caseFolder, review, moderators
+  #     ORDER BY caseFolder.updatedAt ASC, review.updatedAt ASC
+  #     WITH collect(moderators) AS orderedModerators
+  #     WITH orderedModerators[0] AS moderator
+  #     RETURN moderator
+  #     """
+  #   )
   pinned: Boolean
   createdAt: String
   updatedAt: String
diff --git a/backend/src/schema/types/type/User.gql b/backend/src/schema/types/type/User.gql
index 115aa9544..576bb2ebb 100644
--- a/backend/src/schema/types/type/User.gql
+++ b/backend/src/schema/types/type/User.gql
@@ -33,13 +33,24 @@ type User {
   coverImg: String
   deleted: Boolean
   disabled: Boolean
+  # Wolle reviewedByModerator: User
+  #   @cypher(
+  #     statement: """
+  #     MATCH (this)<-[:FLAGGED]-(caseFolder:CaseFolder)<-[review:REVIEWED]-(moderator:User)
+  #     RETURN moderator
+  #     ORDER BY caseFolder.updatedAt ASC, review.updatedAt ASC
+  #     LIMIT 1
+  #     """
+  #   )
   reviewedByModerator: User
     @cypher(
       statement: """
-      MATCH (this)<-[:FLAGGED]-(caseFolder:CaseFolder)<-[review:REVIEWED]-(moderator:User)
-      RETURN moderator
+      MATCH (this)<-[:FLAGGED]-(caseFolder:CaseFolder)<-[review:REVIEWED]-(moderators:User)
+      WITH caseFolder, review, moderators
       ORDER BY caseFolder.updatedAt ASC, review.updatedAt ASC
-      LIMIT 1
+      WITH collect(moderators) AS orderedModerators
+      WITH orderedModerators[0] AS moderator
+      RETURN moderator
       """
     )
   role: UserGroup!

From 2e3908c0093bba41f94d1d2dd81ab5d6c14cd1b6 Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Thu, 21 Nov 2019 19:13:46 +0100
Subject: [PATCH 049/174] refactor: close session in isAuthor permission

---
 .../src/middleware/permissionsMiddleware.js   | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/backend/src/middleware/permissionsMiddleware.js b/backend/src/middleware/permissionsMiddleware.js
index b0d07c8ec..9ba33d3ff 100644
--- a/backend/src/middleware/permissionsMiddleware.js
+++ b/backend/src/middleware/permissionsMiddleware.js
@@ -68,21 +68,21 @@ const isAuthor = rule({
   if (!user) return false
   const session = driver.session()
   const { id: resourceId } = args
-  const result = await session.run(
-    `
-  MATCH (resource {id: $resourceId})<-[:WROTE]-(author)
-  RETURN author
-  `,
-    {
-      resourceId,
-    },
-  )
-  session.close()
-  const [author] = result.records.map(record => {
-    return record.get('author')
-  })
-  const authorId = author && author.properties && author.properties.id
-  return authorId === user.id
+  try {
+    const result = await session.run(
+      `
+      MATCH (resource {id: $resourceId})<-[:WROTE]-(author {id: $userId})
+      RETURN author
+    `,
+      { resourceId, userId: user.id },
+    )
+    const [author] = result.records.map(record => {
+      return record.get('author')
+    })
+    return !!author
+  } finally {
+    session.close()
+  }
 })
 
 const isDeletingOwnAccount = rule({

From c010d4b0ae6fa48e3ea7ca9383fa984efa4eb484 Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Thu, 21 Nov 2019 19:16:49 +0100
Subject: [PATCH 050/174] refactor: remove obsolete code

Since we decided to open Human Connection for public registration, we
don't need to create artificial shortage of signups. The original
intention here was too:

1. Grow the network slowly and under control
2. Create an incentive for users to invite their friends

Point 2 is now obsolete, everyone can signup herself. Point 1 is based
on the (seemingly) wrong assumption that there will be a "run" on the
network if we open it for public registration. Our growth was fairly
stable so far.
---
 .../src/middleware/permissionsMiddleware.js   |  22 --
 backend/src/models/index.js                   |   1 -
 backend/src/schema/index.js                   |   1 -
 backend/src/schema/resolvers/registration.js  |  48 ----
 .../src/schema/resolvers/registration.spec.js | 237 ------------------
 .../src/schema/types/type/InvitationCode.gql  |  10 -
 6 files changed, 319 deletions(-)
 delete mode 100644 backend/src/schema/types/type/InvitationCode.gql

diff --git a/backend/src/middleware/permissionsMiddleware.js b/backend/src/middleware/permissionsMiddleware.js
index b0d07c8ec..59a425494 100644
--- a/backend/src/middleware/permissionsMiddleware.js
+++ b/backend/src/middleware/permissionsMiddleware.js
@@ -41,27 +41,6 @@ const isMySocialMedia = rule({
   return socialMedia.ownedBy.node.id === user.id
 })
 
-const invitationLimitReached = rule({
-  cache: 'no_cache',
-})(async (parent, args, { user, driver }) => {
-  const session = driver.session()
-  try {
-    const result = await session.run(
-      `
-      MATCH (user:User {id:$id})-[:GENERATED]->(i:InvitationCode)
-      RETURN COUNT(i) >= 3 as limitReached
-      `,
-      { id: user.id },
-    )
-    const [limitReached] = result.records.map(record => {
-      return record.get('limitReached')
-    })
-    return limitReached
-  } finally {
-    session.close()
-  }
-})
-
 const isAuthor = rule({
   cache: 'no_cache',
 })(async (_parent, args, { user, driver }) => {
@@ -129,7 +108,6 @@ const permissions = shield(
       SignupByInvitation: allow,
       Signup: or(publicRegistration, isAdmin),
       SignupVerification: allow,
-      CreateInvitationCode: and(isAuthenticated, or(not(invitationLimitReached), isAdmin)),
       UpdateUser: onlyYourself,
       CreatePost: isAuthenticated,
       UpdatePost: isAuthor,
diff --git a/backend/src/models/index.js b/backend/src/models/index.js
index bd89ddc51..239076adc 100644
--- a/backend/src/models/index.js
+++ b/backend/src/models/index.js
@@ -3,7 +3,6 @@
 export default {
   Badge: require('./Badge.js'),
   User: require('./User.js'),
-  InvitationCode: require('./InvitationCode.js'),
   EmailAddress: require('./EmailAddress.js'),
   UnverifiedEmailAddress: require('./UnverifiedEmailAddress.js'),
   SocialMedia: require('./SocialMedia.js'),
diff --git a/backend/src/schema/index.js b/backend/src/schema/index.js
index 516f47abd..4252bd817 100644
--- a/backend/src/schema/index.js
+++ b/backend/src/schema/index.js
@@ -10,7 +10,6 @@ export default makeAugmentedSchema({
       exclude: [
         'Badge',
         'Embed',
-        'InvitationCode',
         'EmailAddress',
         'Notfication',
         'Statistics',
diff --git a/backend/src/schema/resolvers/registration.js b/backend/src/schema/resolvers/registration.js
index d425357c3..4184c9b1d 100644
--- a/backend/src/schema/resolvers/registration.js
+++ b/backend/src/schema/resolvers/registration.js
@@ -10,25 +10,6 @@ const instance = neode()
 
 export default {
   Mutation: {
-    CreateInvitationCode: async (_parent, args, context, _resolveInfo) => {
-      args.token = generateNonce()
-      const {
-        user: { id: userId },
-      } = context
-      let response
-      try {
-        const [user, invitationCode] = await Promise.all([
-          instance.find('User', userId),
-          instance.create('InvitationCode', args),
-        ])
-        await invitationCode.relateTo(user, 'generatedBy')
-        response = invitationCode.toJson()
-        response.generatedBy = user.toJson()
-      } catch (e) {
-        throw new UserInputError(e)
-      }
-      return response
-    },
     Signup: async (_parent, args, context) => {
       args.nonce = generateNonce()
       args.email = normalizeEmail(args.email)
@@ -41,35 +22,6 @@ export default {
         throw new UserInputError(e.message)
       }
     },
-    SignupByInvitation: async (_parent, args, context) => {
-      const { token } = args
-      args.nonce = generateNonce()
-      args.email = normalizeEmail(args.email)
-      let emailAddress = await existingEmailAddress({ args, context })
-      if (emailAddress) return emailAddress
-      try {
-        const result = await instance.cypher(
-          `
-        MATCH (invitationCode:InvitationCode {token:{token}})
-        WHERE NOT (invitationCode)-[:ACTIVATED]->()
-        RETURN invitationCode
-        `,
-          { token },
-        )
-        const validInvitationCode = instance.hydrateFirst(
-          result,
-          'invitationCode',
-          instance.model('InvitationCode'),
-        )
-        if (!validInvitationCode)
-          throw new UserInputError('Invitation code already used or does not exist.')
-        emailAddress = await instance.create('EmailAddress', args)
-        await validInvitationCode.relateTo(emailAddress, 'activated')
-        return emailAddress.toJson()
-      } catch (e) {
-        throw new UserInputError(e)
-      }
-    },
     SignupVerification: async (_parent, args) => {
       const { termsAndConditionsAgreedVersion } = args
       const regEx = new RegExp(/^[0-9]+\.[0-9]+\.[0-9]+$/g)
diff --git a/backend/src/schema/resolvers/registration.spec.js b/backend/src/schema/resolvers/registration.spec.js
index 7d53b63c9..684fea0e8 100644
--- a/backend/src/schema/resolvers/registration.spec.js
+++ b/backend/src/schema/resolvers/registration.spec.js
@@ -34,243 +34,6 @@ afterEach(async () => {
   await factory.cleanDatabase()
 })
 
-describe('CreateInvitationCode', () => {
-  const mutation = gql`
-    mutation {
-      CreateInvitationCode {
-        token
-      }
-    }
-  `
-
-  describe('unauthenticated', () => {
-    beforeEach(() => {
-      authenticatedUser = null
-    })
-
-    it('throws Authorization error', async () => {
-      await expect(mutate({ mutation })).resolves.toMatchObject({
-        errors: [{ message: 'Not Authorised!' }],
-      })
-    })
-  })
-
-  describe('authenticated', () => {
-    beforeEach(async () => {
-      user = await factory.create('User', {
-        id: 'i123',
-        name: 'Inviter',
-        email: 'inviter@example.org',
-        password: '1234',
-        termsAndConditionsAgreedVersion: null,
-      })
-      authenticatedUser = await user.toJson()
-    })
-
-    it('resolves', async () => {
-      await expect(mutate({ mutation })).resolves.toMatchObject({
-        data: { CreateInvitationCode: { token: expect.any(String) } },
-      })
-    })
-
-    it('creates an InvitationCode with a `createdAt` attribute', async () => {
-      await mutate({ mutation })
-      const codes = await neode.all('InvitationCode')
-      const invitation = await codes.first().toJson()
-      expect(invitation.createdAt).toBeTruthy()
-      expect(Date.parse(invitation.createdAt)).toEqual(expect.any(Number))
-    })
-
-    it('relates inviting User to InvitationCode', async () => {
-      await mutate({ mutation })
-      const result = await neode.cypher(
-        'MATCH(code:InvitationCode)<-[:GENERATED]-(user:User) RETURN user',
-      )
-      const inviter = neode.hydrateFirst(result, 'user', neode.model('User'))
-      await expect(inviter.toJson()).resolves.toEqual(expect.objectContaining({ name: 'Inviter' }))
-    })
-
-    describe('who has invited a lot of users already', () => {
-      beforeEach(async () => {
-        await Promise.all([mutate({ mutation }), mutate({ mutation }), mutate({ mutation })])
-      })
-
-      describe('as ordinary `user`', () => {
-        it('throws `Not Authorised` because of maximum number of invitations', async () => {
-          await expect(mutate({ mutation })).resolves.toMatchObject({
-            errors: [{ message: 'Not Authorised!' }],
-          })
-        })
-
-        it('creates no additional invitation codes', async () => {
-          await mutate({ mutation })
-          const invitationCodes = await neode.all('InvitationCode')
-          await expect(invitationCodes.toJson()).resolves.toHaveLength(3)
-        })
-      })
-
-      describe('as a strong donator', () => {
-        beforeEach(() => {
-          // What is the setup?
-        })
-
-        it.todo('can invite more people')
-        // it('can invite more people', async () => {
-        // await action()
-        // const invitationQuery = `{ User { createdAt } }`
-        // const { User: users } = await client.request(invitationQuery )
-        // expect(users).toHaveLength(3 + 1 + 1)
-        // })
-      })
-    })
-  })
-})
-
-describe('SignupByInvitation', () => {
-  const mutation = gql`
-    mutation($email: String!, $token: String!) {
-      SignupByInvitation(email: $email, token: $token) {
-        email
-      }
-    }
-  `
-
-  describe('with valid email but invalid InvitationCode', () => {
-    beforeEach(() => {
-      variables = {
-        ...variables,
-        email: 'any-email@example.org',
-        token: 'wut?',
-      }
-    })
-
-    it('throws UserInputError', async () => {
-      await expect(mutate({ mutation, variables })).resolves.toMatchObject({
-        errors: [{ message: 'UserInputError: Invitation code already used or does not exist.' }],
-      })
-    })
-
-    describe('with valid InvitationCode', () => {
-      beforeEach(async () => {
-        const inviter = await factory.create('User', {
-          name: 'Inviter',
-          email: 'inviter@example.org',
-          password: '1234',
-        })
-        authenticatedUser = await inviter.toJson()
-        const invitationMutation = gql`
-          mutation {
-            CreateInvitationCode {
-              token
-            }
-          }
-        `
-        const {
-          data: {
-            CreateInvitationCode: { token },
-          },
-        } = await mutate({ mutation: invitationMutation })
-        authenticatedUser = null
-        variables = {
-          ...variables,
-          token,
-        }
-      })
-
-      describe('given an invalid email', () => {
-        beforeEach(() => {
-          variables = { ...variables, email: 'someuser' }
-        })
-
-        it('throws `email is not a valid email`', async () => {
-          await expect(mutate({ mutation, variables })).resolves.toMatchObject({
-            errors: [{ message: expect.stringContaining('"email" must be a valid email') }],
-          })
-        })
-
-        it('creates no additional EmailAddress node', async () => {
-          let emailAddresses = await neode.all('EmailAddress')
-          emailAddresses = await emailAddresses.toJson()
-          expect(emailAddresses).toHaveLength(1)
-          await mutate({ mutation, variables })
-          emailAddresses = await neode.all('EmailAddress')
-          emailAddresses = await emailAddresses.toJson()
-          expect(emailAddresses).toHaveLength(1)
-        })
-      })
-
-      describe('given a valid email', () => {
-        beforeEach(() => {
-          variables = { ...variables, email: 'someUser@example.org' }
-        })
-
-        it('resolves', async () => {
-          await expect(mutate({ mutation, variables })).resolves.toMatchObject({
-            data: { SignupByInvitation: { email: 'someuser@example.org' } },
-          })
-        })
-
-        describe('creates a EmailAddress node', () => {
-          it('with a `createdAt` attribute', async () => {
-            await mutate({ mutation, variables })
-            let emailAddress = await neode.first('EmailAddress', { email: 'someuser@example.org' })
-            emailAddress = await emailAddress.toJson()
-            expect(emailAddress.createdAt).toBeTruthy()
-            expect(Date.parse(emailAddress.createdAt)).toEqual(expect.any(Number))
-          })
-
-          it('with a cryptographic `nonce`', async () => {
-            await mutate({ mutation, variables })
-            let emailAddress = await neode.first('EmailAddress', { email: 'someuser@example.org' })
-            emailAddress = await emailAddress.toJson()
-            expect(emailAddress.nonce).toEqual(expect.any(String))
-          })
-
-          it('connects inviter through invitation code', async () => {
-            await mutate({ mutation, variables })
-            const result = await neode.cypher(
-              'MATCH(inviter:User)-[:GENERATED]->(:InvitationCode)-[:ACTIVATED]->(email:EmailAddress {email: {email}}) RETURN inviter',
-              { email: 'someuser@example.org' },
-            )
-            const inviter = neode.hydrateFirst(result, 'inviter', neode.model('User'))
-            await expect(inviter.toJson()).resolves.toEqual(
-              expect.objectContaining({ name: 'Inviter' }),
-            )
-          })
-
-          describe('using the same InvitationCode twice', () => {
-            it('rejects because codes can be used only once', async () => {
-              await mutate({ mutation, variables })
-              variables = { ...variables, email: 'yetanotheremail@example.org' }
-              await expect(mutate({ mutation, variables })).resolves.toMatchObject({
-                errors: [
-                  { message: 'UserInputError: Invitation code already used or does not exist.' },
-                ],
-              })
-            })
-          })
-
-          describe('if a user account with the given email already exists', () => {
-            beforeEach(async () => {
-              await factory.create('User', { email: 'someuser@example.org' })
-            })
-
-            it('throws unique violation error', async () => {
-              await expect(mutate({ mutation, variables })).resolves.toMatchObject({
-                errors: [{ message: 'A user account with this email already exists.' }],
-              })
-            })
-          })
-
-          describe('if the EmailAddress already exists but without user account', () => {
-            it.todo('shall we re-send the registration email?')
-          })
-        })
-      })
-    })
-  })
-})
-
 describe('Signup', () => {
   const mutation = gql`
     mutation($email: String!) {
diff --git a/backend/src/schema/types/type/InvitationCode.gql b/backend/src/schema/types/type/InvitationCode.gql
deleted file mode 100644
index 61ce0f689..000000000
--- a/backend/src/schema/types/type/InvitationCode.gql
+++ /dev/null
@@ -1,10 +0,0 @@
-type InvitationCode {
-  id: ID!
-  token: String
-  generatedBy: User @relation(name: "GENERATED", direction: "IN")
-  createdAt: String
-}
-
-type Mutation {
-  CreateInvitationCode: InvitationCode
-}

From a5689e2f678cf2dc6f0d9b3a61cd83d4b5acca58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Fri, 22 Nov 2019 08:44:40 +0100
Subject: [PATCH 051/174] Get implementing 'reviewedByModerator' further

---
 backend/src/schema/resolvers/comments.js      | 34 +++----------------
 .../schema/resolvers/helpers/claimResource.js | 21 ++++++++++++
 backend/src/schema/resolvers/posts.js         | 23 +++----------
 backend/src/schema/resolvers/users.js         |  7 ++--
 backend/src/schema/types/type/Comment.gql     | 20 +++++------
 backend/src/schema/types/type/User.gql        | 20 +++++------
 6 files changed, 53 insertions(+), 72 deletions(-)
 create mode 100644 backend/src/schema/resolvers/helpers/claimResource.js

diff --git a/backend/src/schema/resolvers/comments.js b/backend/src/schema/resolvers/comments.js
index 13d06506e..4a3d4f1d1 100644
--- a/backend/src/schema/resolvers/comments.js
+++ b/backend/src/schema/resolvers/comments.js
@@ -1,5 +1,6 @@
 import uuid from 'uuid/v4'
 import Resolver from './helpers/Resolver'
+import { queryReviewedByModerator } from './helpers/claimResource.js'
 
 export default {
   Mutation: {
@@ -69,37 +70,10 @@ export default {
       hasOne: {
         author: '<-[:WROTE]-(related:User)',
         post: '-[:COMMENTS]->(related:Post)',
-        // Wolle !!! Following statement is not correct, but the correct (see file 'backend/src/schema/types/type/Comment.gql') makes an error. Should be: '<-[:FLAGGED]-(caseFolder:CaseFolder)<-[review:REVIEWED]-(related:User) RETURN related ORDER BY caseFolder.updatedAt ASC, review.updatedAt ASC LIMIT 1'
-        // Wolle reviewedByModerator: '<-[:FLAGGED]-(caseFolder:CaseFolder)<-[review:REVIEWED]-(related:User)',
-        reviewedByModerator: '<-[:FLAGGED]-(caseFolder:CaseFolder)<-[review:REVIEWED]-(related:User) WITH caseFolder, review, related ORDER BY caseFolder.updatedAt ASC, review.updatedAt ASC WITH collect(related) AS orderedRelated WITH orderedRelated[0] AS related',
       },
     }),
-    // Wolle reviewedByModerator: async (parent, params, context, resolveInfo) => {
-    //   console.log('reviewedByModerator !!!')
-    //   console.log('reviewedByModerator !!!')
-    //   console.log('reviewedByModerator !!!')
-    //   console.log('reviewedByModerator !!!')
-    //   console.log('reviewedByModerator !!!')
-    //   if (typeof parent.reviewedByModerator !== 'undefined') return parent.reviewedByModerator
-    //   // const { id } = parent
-    //   // const statement = `
-    //   // MATCH (p:Post {id: $id})-[:TAGGED|CATEGORIZED]->(categoryOrTag)<-[:TAGGED|CATEGORIZED]-(post:Post)
-    //   // WHERE NOT post.deleted AND NOT post.disabled
-    //   // RETURN DISTINCT post
-    //   // LIMIT 10
-    //   // `
-    //   // let reviewedByModerator
-    //   // const session = context.driver.session()
-    //   // try {
-    //   //   const result = await session.run(statement, { id })
-    //   //   relatedContributions = result.records.map(r => r.get('post').properties)
-    //   // } finally {
-    //   //   session.close()
-    //   // }
-    //   // return reviewedByModerator
-    //   return {
-    //     id: 'Hallo !!!'
-    //   }
-    // },
+    reviewedByModerator: async (parent, _params, context, _resolveInfo) => {
+      return await queryReviewedByModerator('Comment', parent, context)
+    },
   },
 }
diff --git a/backend/src/schema/resolvers/helpers/claimResource.js b/backend/src/schema/resolvers/helpers/claimResource.js
new file mode 100644
index 000000000..75e68afbe
--- /dev/null
+++ b/backend/src/schema/resolvers/helpers/claimResource.js
@@ -0,0 +1,21 @@
+export async function queryReviewedByModerator(label, parent, context) {
+  if (typeof parent.reviewedByModerator !== 'undefined') return parent.reviewedByModerator
+  const { id } = parent
+  const statement = `
+    MATCH (resource {id: $id})<-[:FLAGGED]-(caseFolder:CaseFolder)<-[review:REVIEWED]-(moderator:User)
+    WHERE $label IN labels(resource)
+    RETURN moderator
+    ORDER BY caseFolder.updatedAt DESC, review.updatedAt DESC
+    LIMIT 1
+  `
+  let reviewedByModerator
+  const session = context.driver.session()
+  try {
+    const result = await session.run(statement, { label, id })
+    const [firstElement] = result.records.map(r => r.get('moderator').properties)
+    reviewedByModerator = firstElement 
+  } finally {
+    session.close()
+  }
+  return reviewedByModerator
+}
diff --git a/backend/src/schema/resolvers/posts.js b/backend/src/schema/resolvers/posts.js
index b4eeac489..7875772c4 100644
--- a/backend/src/schema/resolvers/posts.js
+++ b/backend/src/schema/resolvers/posts.js
@@ -5,6 +5,8 @@ import { getBlockedUsers, getBlockedByUsers } from './users.js'
 import { mergeWith, isArray, isEmpty } from 'lodash'
 import { UserInputError } from 'apollo-server'
 import Resolver from './helpers/Resolver'
+import { queryReviewedByModerator } from './helpers/claimResource.js'
+
 const filterForBlockedUsers = async (params, context) => {
   if (!context.user) return params
   const [blockedUsers, blockedByUsers] = await Promise.all([
@@ -340,25 +342,8 @@ export default {
       }
       return relatedContributions
     },
-    reviewedByModerator: async (parent, params, context, resolveInfo) => {
-      if (typeof parent.reviewedByModerator !== 'undefined') return parent.reviewedByModerator
-      const { id } = parent
-      const statement = `
-        MATCH (p:Post {id: $id})<-[:FLAGGED]-(caseFolder:CaseFolder)<-[review:REVIEWED]-(moderator:User)
-        RETURN moderator
-        ORDER BY caseFolder.updatedAt ASC, review.updatedAt ASC
-        LIMIT 1
-      `
-      let reviewedByModerator
-      const session = context.driver.session()
-      try {
-        const result = await session.run(statement, { id })
-        const [firstElement] = result.records.map(r => r.get('moderator').properties)
-        reviewedByModerator = firstElement 
-      } finally {
-        session.close()
-      }
-      return reviewedByModerator
+    reviewedByModerator: async (parent, _params, context, _resolveInfo) => {
+      return await queryReviewedByModerator('Post', parent, context)
     },
   },
 }
diff --git a/backend/src/schema/resolvers/users.js b/backend/src/schema/resolvers/users.js
index 0fe77c88d..d985a1382 100644
--- a/backend/src/schema/resolvers/users.js
+++ b/backend/src/schema/resolvers/users.js
@@ -3,6 +3,7 @@ import fileUpload from './fileUpload'
 import { neode } from '../../bootstrap/neo4j'
 import { UserInputError, ForbiddenError } from 'apollo-server'
 import Resolver from './helpers/Resolver'
+import { queryReviewedByModerator } from './helpers/claimResource.js'
 
 const instance = neode()
 
@@ -200,9 +201,6 @@ export default {
       },
       hasOne: {
         invitedBy: '<-[:INVITED]-(related:User)',
-        // Wolle !!! Following statement is not correct, but the correct (see file 'backend/src/schema/types/type/User.gql') makes an error. Should be: '<-[:FLAGGED]-(caseFolder:CaseFolder)<-[review:REVIEWED]-(related:User) RETURN related ORDER BY caseFolder.updatedAt ASC, review.updatedAt ASC LIMIT 1'
-        // Wolle reviewedByModerator: '<-[:FLAGGED]-(caseFolder:CaseFolder)<-[review:REVIEWED]-(related:User)',
-        reviewedByModerator: '<-[:FLAGGED]-(caseFolder:CaseFolder)<-[review:REVIEWED]-(moderators:User) WITH caseFolder, review, moderators ORDER BY caseFolder.updatedAt ASC, review.updatedAt ASC WITH collect(moderators) AS orderedModerators WITH orderedModerators AS related',
         location: '-[:IS_IN]->(related:Location)',
       },
       hasMany: {
@@ -217,5 +215,8 @@ export default {
         badges: '<-[:REWARDED]-(related:Badge)',
       },
     }),
+    reviewedByModerator: async (parent, _params, context, _resolveInfo) => {
+      return await queryReviewedByModerator('User', parent, context)
+    },
   },
 }
diff --git a/backend/src/schema/types/type/Comment.gql b/backend/src/schema/types/type/Comment.gql
index 347b7fc20..bc9d6ae69 100644
--- a/backend/src/schema/types/type/Comment.gql
+++ b/backend/src/schema/types/type/Comment.gql
@@ -19,16 +19,16 @@ type Comment {
     #   """
     # )
   reviewedByModerator: User
-    @cypher(
-      statement: """
-      MATCH (this)<-[:FLAGGED]-(caseFolder:CaseFolder)<-[review:REVIEWED]-(moderators:User)
-      WITH caseFolder, review, moderators
-      ORDER BY caseFolder.updatedAt ASC, review.updatedAt ASC
-      WITH collect(moderators) AS orderedModerators
-      WITH orderedModerators[0] AS moderator
-      RETURN moderator
-      """
-    )
+    # Wolle @cypher(
+    #   statement: """
+    #   MATCH (this)<-[:FLAGGED]-(caseFolder:CaseFolder)<-[review:REVIEWED]-(moderators:User)
+    #   WITH caseFolder, review, moderators
+    #   ORDER BY caseFolder.updatedAt ASC, review.updatedAt ASC
+    #   WITH collect(moderators) AS orderedModerators
+    #   WITH orderedModerators[0] AS moderator
+    #   RETURN moderator
+    #   """
+    # )
 }
 
 type Mutation {
diff --git a/backend/src/schema/types/type/User.gql b/backend/src/schema/types/type/User.gql
index 576bb2ebb..77a77616f 100644
--- a/backend/src/schema/types/type/User.gql
+++ b/backend/src/schema/types/type/User.gql
@@ -43,16 +43,16 @@ type User {
   #     """
   #   )
   reviewedByModerator: User
-    @cypher(
-      statement: """
-      MATCH (this)<-[:FLAGGED]-(caseFolder:CaseFolder)<-[review:REVIEWED]-(moderators:User)
-      WITH caseFolder, review, moderators
-      ORDER BY caseFolder.updatedAt ASC, review.updatedAt ASC
-      WITH collect(moderators) AS orderedModerators
-      WITH orderedModerators[0] AS moderator
-      RETURN moderator
-      """
-    )
+    # Wolle @cypher(
+    #   statement: """
+    #   MATCH (this)<-[:FLAGGED]-(caseFolder:CaseFolder)<-[review:REVIEWED]-(moderators:User)
+    #   WITH caseFolder, review, moderators
+    #   ORDER BY caseFolder.updatedAt ASC, review.updatedAt ASC
+    #   WITH collect(moderators) AS orderedModerators
+    #   WITH orderedModerators[0] AS moderator
+    #   RETURN moderator
+    #   """
+    # )
   role: UserGroup!
   publicKey: String
   invitedBy: User @relation(name: "INVITED", direction: "IN")

From a7aaee98c19d62d6005f6c44e81ec6fcea3978e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Fri, 22 Nov 2019 10:27:43 +0100
Subject: [PATCH 052/174] No new review if a reviewer changes their opinion

---
 backend/src/schema/resolvers/comments.js      |  2 +-
 .../schema/resolvers/helpers/claimResource.js |  2 +-
 backend/src/schema/resolvers/moderation.js    | 34 ++++++++++++++-----
 backend/src/schema/resolvers/posts.js         |  2 +-
 backend/src/schema/resolvers/reports.js       |  2 +-
 backend/src/schema/resolvers/users.js         |  2 +-
 backend/src/schema/types/type/CaseFolder.gql  |  2 +-
 backend/src/schema/types/type/Comment.gql     | 27 +++++----------
 backend/src/schema/types/type/Post.gql        | 27 +++++----------
 backend/src/schema/types/type/User.gql        | 29 +++++-----------
 ...ange_disabled_relationship_to_case_node.sh |  4 +--
 11 files changed, 58 insertions(+), 75 deletions(-)

diff --git a/backend/src/schema/resolvers/comments.js b/backend/src/schema/resolvers/comments.js
index 4a3d4f1d1..476e64b1b 100644
--- a/backend/src/schema/resolvers/comments.js
+++ b/backend/src/schema/resolvers/comments.js
@@ -73,7 +73,7 @@ export default {
       },
     }),
     reviewedByModerator: async (parent, _params, context, _resolveInfo) => {
-      return await queryReviewedByModerator('Comment', parent, context)
+      return queryReviewedByModerator('Comment', parent, context)
     },
   },
 }
diff --git a/backend/src/schema/resolvers/helpers/claimResource.js b/backend/src/schema/resolvers/helpers/claimResource.js
index 75e68afbe..22ec69f5f 100644
--- a/backend/src/schema/resolvers/helpers/claimResource.js
+++ b/backend/src/schema/resolvers/helpers/claimResource.js
@@ -13,7 +13,7 @@ export async function queryReviewedByModerator(label, parent, context) {
   try {
     const result = await session.run(statement, { label, id })
     const [firstElement] = result.records.map(r => r.get('moderator').properties)
-    reviewedByModerator = firstElement 
+    reviewedByModerator = firstElement
   } finally {
     session.close()
   }
diff --git a/backend/src/schema/resolvers/moderation.js b/backend/src/schema/resolvers/moderation.js
index 0debb80ea..c61b7f5fe 100644
--- a/backend/src/schema/resolvers/moderation.js
+++ b/backend/src/schema/resolvers/moderation.js
@@ -29,7 +29,9 @@ export default {
       // Wolle console.log('params: ', params)
       const { resourceId } = params
       // Wolle console.log('resourceId: ', resourceId)
-      const { disable, closed } = params
+      let { disable, closed } = params
+      disable = disable === undefined ? null : disable
+      closed = closed === undefined ? null : closed
       // Wolle console.log('disable: ', disable)
       const { user: moderator, driver } = context
 
@@ -118,22 +120,38 @@ export default {
             MATCH (moderator:User {id: $moderatorId})
             MATCH (resource {id: $resourceId})
             WHERE resource:User OR resource:Post OR resource:Comment
+            // report exists?
             //WHERE (caseFolder)<-[report:REPORTED]-(submitter:User)
 
             // no open caseFolder, create one, update existing
             MERGE (resource)<-[:FLAGGED]-(caseFolder:CaseFolder {closed: false})
-            ON CREATE SET caseFolder.id = randomUUID(), caseFolder.createdAt = $createdAt, caseFolder.updatedAt = caseFolder.createdAt, caseFolder.rule = 'latestReviewUpdatedAt', caseFolder.disable = $disable, caseFolder.closed = $closed
-            ON MATCH SET caseFolder.updatedAt = $createdAt, caseFolder.disable = $disable, caseFolder.closed = $closed
+            ON CREATE SET caseFolder.id = randomUUID(), caseFolder.createdAt = $dateTime, caseFolder.updatedAt = caseFolder.createdAt, caseFolder.rule = 'latestReviewUpdatedAtRules', caseFolder.disable = false, caseFolder.closed = false
+            ON MATCH SET caseFolder.updatedAt = $dateTime
+            // caseFolder.disable and caseFolder.closed are set after setting them in review
 
             // Create review on caseFolder
             WITH moderator, resource, caseFolder
-            CREATE (caseFolder)<-[review:REVIEWED {createdAt: $createdAt, updatedAt: $createdAt, disable: $disable, closed: $closed}]-(moderator)
+            MERGE (caseFolder)<-[review:REVIEWED]-(moderator)
+            ON CREATE SET review.createdAt = $dateTime, review.updatedAt = review.createdAt,
+              review.disable = CASE WHEN $disable IS NULL
+                THEN false
+                ELSE $disable END,
+              review.closed = CASE WHEN $closed IS NULL
+                THEN false
+                ELSE $closed END
+            ON MATCH SET
+              review.updatedAt = $dateTime,
+              review.disable = CASE WHEN $disable IS NULL
+                THEN review.disable
+                ELSE $disable END,
+              review.closed = CASE WHEN $closed IS NULL
+                THEN review.closed
+                ELSE $closed END
 
-            SET resource.disabled = $disable
+            SET caseFolder.disable = review.disable, caseFolder.closed = review.closed
+            SET resource.disabled = review.disable
 
             RETURN moderator, review, caseFolder {.id}, resource, labels(resource)[0] AS type
-
-            //RETURN decision, resource, moderator, labels(resource)[0] AS type
           `
 
         // Wolle console.log('cypher: ', cypher)
@@ -159,7 +177,7 @@ export default {
           const mutateDecisionTransactionResponse = await txc.run(cypher, {
             resourceId,
             moderatorId: moderator.id,
-            createdAt: new Date().toISOString(),
+            dateTime: new Date().toISOString(),
             disable,
             closed,
           })
diff --git a/backend/src/schema/resolvers/posts.js b/backend/src/schema/resolvers/posts.js
index 7875772c4..f26ecc0eb 100644
--- a/backend/src/schema/resolvers/posts.js
+++ b/backend/src/schema/resolvers/posts.js
@@ -343,7 +343,7 @@ export default {
       return relatedContributions
     },
     reviewedByModerator: async (parent, _params, context, _resolveInfo) => {
-      return await queryReviewedByModerator('Post', parent, context)
+      return queryReviewedByModerator('Post', parent, context)
     },
   },
 }
diff --git a/backend/src/schema/resolvers/reports.js b/backend/src/schema/resolvers/reports.js
index 9eb3c2d12..c79fef847 100644
--- a/backend/src/schema/resolvers/reports.js
+++ b/backend/src/schema/resolvers/reports.js
@@ -15,7 +15,7 @@ export default {
             WHERE resource:User OR resource:Post OR resource:Comment
             // no open caseFolder, create one
             MERGE (resource)<-[:FLAGGED]-(caseFolder:CaseFolder {closed: false})
-            ON CREATE SET caseFolder.id = randomUUID(), caseFolder.createdAt = $createdAt, caseFolder.updatedAt = caseFolder.createdAt, caseFolder.rule = 'latestReviewUpdatedAt', caseFolder.disable = false, caseFolder.closed = false
+            ON CREATE SET caseFolder.id = randomUUID(), caseFolder.createdAt = $createdAt, caseFolder.updatedAt = caseFolder.createdAt, caseFolder.rule = 'latestReviewUpdatedAtRules', caseFolder.disable = false, caseFolder.closed = false
             // Create report on caseFolder
             WITH submitter, resource, caseFolder
             CREATE (caseFolder)<-[report:REPORTED {createdAt: $createdAt, reasonCategory: $reasonCategory, reasonDescription: $reasonDescription}]-(submitter)
diff --git a/backend/src/schema/resolvers/users.js b/backend/src/schema/resolvers/users.js
index d985a1382..2a43a215f 100644
--- a/backend/src/schema/resolvers/users.js
+++ b/backend/src/schema/resolvers/users.js
@@ -216,7 +216,7 @@ export default {
       },
     }),
     reviewedByModerator: async (parent, _params, context, _resolveInfo) => {
-      return await queryReviewedByModerator('User', parent, context)
+      return queryReviewedByModerator('User', parent, context)
     },
   },
 }
diff --git a/backend/src/schema/types/type/CaseFolder.gql b/backend/src/schema/types/type/CaseFolder.gql
index 44e9d3664..ad664302c 100644
--- a/backend/src/schema/types/type/CaseFolder.gql
+++ b/backend/src/schema/types/type/CaseFolder.gql
@@ -10,5 +10,5 @@ type CaseFolder {
 }
 
 enum CaseRule {
-  latestReviewUpdatedAt
+  latestReviewUpdatedAtRules
 }
diff --git a/backend/src/schema/types/type/Comment.gql b/backend/src/schema/types/type/Comment.gql
index bc9d6ae69..dc92c1f9b 100644
--- a/backend/src/schema/types/type/Comment.gql
+++ b/backend/src/schema/types/type/Comment.gql
@@ -9,26 +9,15 @@ type Comment {
   updatedAt: String
   deleted: Boolean
   disabled: Boolean
-  # Wolle reviewedByModerator: User
-    # @cypher(
-    #   statement: """
-    #   MATCH (this)<-[:FLAGGED]-(caseFolder:CaseFolder)<-[review:REVIEWED]-(moderator:User)
-    #   RETURN moderator
-    #   ORDER BY caseFolder.updatedAt ASC, review.updatedAt ASC
-    #   LIMIT 1
-    #   """
-    # )
   reviewedByModerator: User
-    # Wolle @cypher(
-    #   statement: """
-    #   MATCH (this)<-[:FLAGGED]-(caseFolder:CaseFolder)<-[review:REVIEWED]-(moderators:User)
-    #   WITH caseFolder, review, moderators
-    #   ORDER BY caseFolder.updatedAt ASC, review.updatedAt ASC
-    #   WITH collect(moderators) AS orderedModerators
-    #   WITH orderedModerators[0] AS moderator
-    #   RETURN moderator
-    #   """
-    # )
+    @cypher(
+      statement: """
+        MATCH (this)<-[:FLAGGED]-(caseFolder:CaseFolder)<-[review:REVIEWED]-(moderator:User)
+        RETURN moderator
+        ORDER BY caseFolder.updatedAt DESC, review.updatedAt DESC
+        LIMIT 1
+      """
+    )
 }
 
 type Mutation {
diff --git a/backend/src/schema/types/type/Post.gql b/backend/src/schema/types/type/Post.gql
index 915a0ea72..307312900 100644
--- a/backend/src/schema/types/type/Post.gql
+++ b/backend/src/schema/types/type/Post.gql
@@ -122,25 +122,14 @@ type Post {
   deleted: Boolean
   disabled: Boolean
   reviewedByModerator: User
-    # @cypher(
-    #   statement: """
-    #   MATCH (this)<-[:FLAGGED]-(caseFolder:CaseFolder)<-[review:REVIEWED]-(moderator:User)
-    #   RETURN moderator
-    #   ORDER BY caseFolder.updatedAt ASC, review.updatedAt ASC
-    #   LIMIT 1
-    #   """
-    # )
-  # reviewedByModerator: User
-  #   @cypher(
-  #     statement: """
-  #     MATCH (this)<-[:FLAGGED]-(caseFolder:CaseFolder)<-[review:REVIEWED]-(moderators:User)
-  #     WITH caseFolder, review, moderators
-  #     ORDER BY caseFolder.updatedAt ASC, review.updatedAt ASC
-  #     WITH collect(moderators) AS orderedModerators
-  #     WITH orderedModerators[0] AS moderator
-  #     RETURN moderator
-  #     """
-  #   )
+    @cypher(
+      statement: """
+        MATCH (this)<-[:FLAGGED]-(caseFolder:CaseFolder)<-[review:REVIEWED]-(moderator:User)
+        RETURN moderator
+        ORDER BY caseFolder.updatedAt DESC, review.updatedAt DESC
+        LIMIT 1
+      """
+    )
   pinned: Boolean
   createdAt: String
   updatedAt: String
diff --git a/backend/src/schema/types/type/User.gql b/backend/src/schema/types/type/User.gql
index 77a77616f..47635eeb1 100644
--- a/backend/src/schema/types/type/User.gql
+++ b/backend/src/schema/types/type/User.gql
@@ -33,26 +33,15 @@ type User {
   coverImg: String
   deleted: Boolean
   disabled: Boolean
-  # Wolle reviewedByModerator: User
-  #   @cypher(
-  #     statement: """
-  #     MATCH (this)<-[:FLAGGED]-(caseFolder:CaseFolder)<-[review:REVIEWED]-(moderator:User)
-  #     RETURN moderator
-  #     ORDER BY caseFolder.updatedAt ASC, review.updatedAt ASC
-  #     LIMIT 1
-  #     """
-  #   )
   reviewedByModerator: User
-    # Wolle @cypher(
-    #   statement: """
-    #   MATCH (this)<-[:FLAGGED]-(caseFolder:CaseFolder)<-[review:REVIEWED]-(moderators:User)
-    #   WITH caseFolder, review, moderators
-    #   ORDER BY caseFolder.updatedAt ASC, review.updatedAt ASC
-    #   WITH collect(moderators) AS orderedModerators
-    #   WITH orderedModerators[0] AS moderator
-    #   RETURN moderator
-    #   """
-    # )
+    @cypher(
+      statement: """
+        MATCH (this)<-[:FLAGGED]-(caseFolder:CaseFolder)<-[review:REVIEWED]-(moderator:User)
+        RETURN moderator
+        ORDER BY caseFolder.updatedAt DESC, review.updatedAt DESC
+        LIMIT 1
+      """
+    )
   role: UserGroup!
   publicKey: String
   invitedBy: User @relation(name: "INVITED", direction: "IN")
@@ -63,8 +52,6 @@ type User {
   about: String
   socialMedia: [SocialMedia]! @relation(name: "OWNED_BY", direction: "IN")
 
-  # createdAt: DateTime
-  # updatedAt: DateTime
   createdAt: String
   updatedAt: String
 
diff --git a/neo4j/change_disabled_relationship_to_case_node.sh b/neo4j/change_disabled_relationship_to_case_node.sh
index ef7474aa4..7671825fc 100755
--- a/neo4j/change_disabled_relationship_to_case_node.sh
+++ b/neo4j/change_disabled_relationship_to_case_node.sh
@@ -22,7 +22,7 @@ WHERE disabledResource:User OR disabledResource:Comment OR disabledResource:Post
 DELETE disabled
 CREATE (moderator)-[review:REVIEWED]->(caseFolder:CaseFolder)-[:FLAGGED]->(disabledResource)
 SET review.createdAt = toString(datetime()), review.updatedAt = review.createdAt, review.disable = true
-SET caseFolder.id = randomUUID(), caseFolder.createdAt = toString(datetime()), caseFolder.updatedAt = caseFolder.createdAt, caseFolder.rule = 'latestReviewUpdatedAt', caseFolder.disable = true, caseFolder.closed = false
+SET caseFolder.id = randomUUID(), caseFolder.createdAt = toString(datetime()), caseFolder.updatedAt = caseFolder.createdAt, caseFolder.rule = 'latestReviewUpdatedAtRules', caseFolder.disable = true, caseFolder.closed = false
 
 // if disabledResource has no report, then create a moderators default report
 WITH moderator, disabledResource, caseFolder
@@ -45,7 +45,7 @@ echo "
 MATCH (reporter:User)-[oldReport:REPORTED]->(notDisabledResource)
 WHERE notDisabledResource:User OR notDisabledResource:Comment OR notDisabledResource:Post
 MERGE (caseFolder:CaseFolder)-[:FLAGGED]->(notDisabledResource)
-ON CREATE SET caseFolder.id = randomUUID(), caseFolder.createdAt = toString(datetime()), caseFolder.updatedAt = caseFolder.createdAt, caseFolder.rule = 'latestReviewUpdatedAt', caseFolder.disable = false, caseFolder.closed = false
+ON CREATE SET caseFolder.id = randomUUID(), caseFolder.createdAt = toString(datetime()), caseFolder.updatedAt = caseFolder.createdAt, caseFolder.rule = 'latestReviewUpdatedAtRules', caseFolder.disable = false, caseFolder.closed = false
 CREATE (reporter)-[report:REPORTED]->(caseFolder)
 SET report = oldReport
 DELETE oldReport

From 02bdc5ea5d2062b83f154a767dc3aeece34041b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Fri, 22 Nov 2019 12:18:43 +0100
Subject: [PATCH 053/174] Rename node CaseFolder to Claim and relation FLAGGED
 to BELONGS_TO

---
 backend/src/schema/index.js                   |  2 +-
 .../schema/resolvers/helpers/claimResource.js |  4 +-
 backend/src/schema/resolvers/moderation.js    | 44 +++++++++---------
 backend/src/schema/resolvers/reports.js       | 46 +++++++++----------
 .../types/type/{CaseFolder.gql => Claim.gql}  |  8 ++--
 backend/src/schema/types/type/Comment.gql     |  4 +-
 backend/src/schema/types/type/Post.gql        |  4 +-
 backend/src/schema/types/type/REPORTED.gql    |  8 ++--
 backend/src/schema/types/type/REVIEWED.gql    |  2 +-
 backend/src/schema/types/type/User.gql        |  4 +-
 ...ange_disabled_relationship_to_case_node.sh | 20 ++++----
 webapp/graphql/Moderation.js                  |  8 ++--
 webapp/pages/moderation/index.vue             | 20 ++++----
 13 files changed, 86 insertions(+), 88 deletions(-)
 rename backend/src/schema/types/type/{CaseFolder.gql => Claim.gql} (51%)

diff --git a/backend/src/schema/index.js b/backend/src/schema/index.js
index d1ff7ada0..6f58ab131 100644
--- a/backend/src/schema/index.js
+++ b/backend/src/schema/index.js
@@ -20,7 +20,7 @@ export default makeAugmentedSchema({
         'NOTIFIED',
         'REPORTED',
         'REVIEWED',
-        'CaseFolder',
+        'Claim',
         'Donations',
       ],
     },
diff --git a/backend/src/schema/resolvers/helpers/claimResource.js b/backend/src/schema/resolvers/helpers/claimResource.js
index 22ec69f5f..55bc83079 100644
--- a/backend/src/schema/resolvers/helpers/claimResource.js
+++ b/backend/src/schema/resolvers/helpers/claimResource.js
@@ -2,10 +2,10 @@ export async function queryReviewedByModerator(label, parent, context) {
   if (typeof parent.reviewedByModerator !== 'undefined') return parent.reviewedByModerator
   const { id } = parent
   const statement = `
-    MATCH (resource {id: $id})<-[:FLAGGED]-(caseFolder:CaseFolder)<-[review:REVIEWED]-(moderator:User)
+    MATCH (resource {id: $id})<-[:BELONGS_TO]-(claim:Claim)<-[review:REVIEWED]-(moderator:User)
     WHERE $label IN labels(resource)
     RETURN moderator
-    ORDER BY caseFolder.updatedAt DESC, review.updatedAt DESC
+    ORDER BY claim.updatedAt DESC, review.updatedAt DESC
     LIMIT 1
   `
   let reviewedByModerator
diff --git a/backend/src/schema/resolvers/moderation.js b/backend/src/schema/resolvers/moderation.js
index c61b7f5fe..594ca4b3c 100644
--- a/backend/src/schema/resolvers/moderation.js
+++ b/backend/src/schema/resolvers/moderation.js
@@ -10,14 +10,14 @@
 
 //         // Wolle only review on reported resources
 
-//         MATCH (caseModerator:User)-[:REPORTED]->(caseFolder:CaseFolder {closed: false})-[:FLAGGED]->(resource {id: $resourceId})
+//         MATCH (caseModerator:User)-[:REPORTED]->(claim:Claim {closed: false})-[:BELONGS_TO]->(resource {id: $resourceId})
 //         WHERE resource:User OR resource:Post OR resource:Comment
-//         RETURN caseFolder, caseModerator {.id}
+//         RETURN claim, caseModerator {.id}
 //       `,
 //       { resourceId },
 //     )
 //     return queryOpenDecisionTransactionResponse.records.map(record => ({
-//       caseFolder: record.get('caseFolder'),
+//       claim: record.get('claim'),
 //       caseModerator: record.get('caseModerator'),
 //     }))
 //   })
@@ -54,7 +54,7 @@ export default {
 
         // // Wolle openDecisionTxResult should not be undefined !!!
         // if (!openDecisionTxResult) {
-        //   // no open caseFolder, then create one
+        //   // no open claim, then create one
         //   if (disable === undefined) disable = false // default for creation
         //   if (closed === undefined) closed = false // default for creation
         //   cypherHeader = `
@@ -68,9 +68,9 @@ export default {
         //       SET decision.latest = true
         //       `
         // } else {
-        //   // an open caseFolder, then change it
-        //   if (disable === undefined) disable = openDecisionTxResult.caseFolder.properties.disable // default set to existing
-        //   if (closed === undefined) closed = openDecisionTxResult.caseFolder.properties.closed // default set to existing
+        //   // an open claim, then change it
+        //   if (disable === undefined) disable = openDecisionTxResult.claim.properties.disable // default set to existing
+        //   if (closed === undefined) closed = openDecisionTxResult.claim.properties.closed // default set to existing
         //   // current moderator is not the same as old
         //   if (moderator.id !== openDecisionTxResult.caseModerator.id) {
         //     // from a different moderator, then create relation with properties to new moderator
@@ -85,7 +85,7 @@ export default {
         //         SET decision = oldDecision
         //       `
         //   } else {
-        //     // an open caseFolder from same moderator, then match this
+        //     // an open claim from same moderator, then match this
         //     cypherHeader = `
         //         MATCH (moderator:User)-[decision:DECIDED {closed: false}]->(resource {id: $resourceId})
         //         WHERE resource:User OR resource:Comment OR resource:Post
@@ -121,17 +121,17 @@ export default {
             MATCH (resource {id: $resourceId})
             WHERE resource:User OR resource:Post OR resource:Comment
             // report exists?
-            //WHERE (caseFolder)<-[report:REPORTED]-(submitter:User)
+            //WHERE (claim)<-[report:REPORTED]-(submitter:User)
 
-            // no open caseFolder, create one, update existing
-            MERGE (resource)<-[:FLAGGED]-(caseFolder:CaseFolder {closed: false})
-            ON CREATE SET caseFolder.id = randomUUID(), caseFolder.createdAt = $dateTime, caseFolder.updatedAt = caseFolder.createdAt, caseFolder.rule = 'latestReviewUpdatedAtRules', caseFolder.disable = false, caseFolder.closed = false
-            ON MATCH SET caseFolder.updatedAt = $dateTime
-            // caseFolder.disable and caseFolder.closed are set after setting them in review
+            // no open claim, create one, update existing
+            MERGE (resource)<-[:BELONGS_TO]-(claim:Claim {closed: false})
+            ON CREATE SET claim.id = randomUUID(), claim.createdAt = $dateTime, claim.updatedAt = claim.createdAt, claim.rule = 'latestReviewUpdatedAtRules', claim.disable = false, claim.closed = false
+            ON MATCH SET claim.updatedAt = $dateTime
+            // claim.disable and claim.closed are set after setting them in review
 
-            // Create review on caseFolder
-            WITH moderator, resource, caseFolder
-            MERGE (caseFolder)<-[review:REVIEWED]-(moderator)
+            // Create review on claim
+            WITH moderator, resource, claim
+            MERGE (claim)<-[review:REVIEWED]-(moderator)
             ON CREATE SET review.createdAt = $dateTime, review.updatedAt = review.createdAt,
               review.disable = CASE WHEN $disable IS NULL
                 THEN false
@@ -148,10 +148,10 @@ export default {
                 THEN review.closed
                 ELSE $closed END
 
-            SET caseFolder.disable = review.disable, caseFolder.closed = review.closed
+            SET claim.disable = review.disable, claim.closed = review.closed
             SET resource.disabled = review.disable
 
-            RETURN moderator, review, caseFolder {.id}, resource, labels(resource)[0] AS type
+            RETURN moderator, review, claim {.id}, resource, labels(resource)[0] AS type
           `
 
         // Wolle console.log('cypher: ', cypher)
@@ -184,7 +184,7 @@ export default {
           return mutateDecisionTransactionResponse.records.map(record => ({
             moderator: record.get('moderator'),
             review: record.get('review'),
-            caseFolder: record.get('caseFolder'),
+            claim: record.get('claim'),
             resource: record.get('resource'),
             type: record.get('type'),
           }))
@@ -200,11 +200,11 @@ export default {
         //   comment: null,
         //   user: null,
         // }
-        const { moderator: moderatorInResult, review, caseFolder, resource, type } = txResult[0]
+        const { moderator: moderatorInResult, review, claim, resource, type } = txResult[0]
         createdRelationshipWithNestedAttributes = {
           ...review.properties,
           moderator: moderatorInResult.properties,
-          caseFolderId: caseFolder.id,
+          claimId: claim.id,
           type,
           post: null,
           comment: null,
diff --git a/backend/src/schema/resolvers/reports.js b/backend/src/schema/resolvers/reports.js
index c79fef847..b05d82b9d 100644
--- a/backend/src/schema/resolvers/reports.js
+++ b/backend/src/schema/resolvers/reports.js
@@ -13,14 +13,14 @@ export default {
             MATCH (submitter:User {id: $submitterId})
             MATCH (resource {id: $resourceId})
             WHERE resource:User OR resource:Post OR resource:Comment
-            // no open caseFolder, create one
-            MERGE (resource)<-[:FLAGGED]-(caseFolder:CaseFolder {closed: false})
-            ON CREATE SET caseFolder.id = randomUUID(), caseFolder.createdAt = $createdAt, caseFolder.updatedAt = caseFolder.createdAt, caseFolder.rule = 'latestReviewUpdatedAtRules', caseFolder.disable = false, caseFolder.closed = false
-            // Create report on caseFolder
-            WITH submitter, resource, caseFolder
-            CREATE (caseFolder)<-[report:REPORTED {createdAt: $createdAt, reasonCategory: $reasonCategory, reasonDescription: $reasonDescription}]-(submitter)
+            // no open claim, create one
+            MERGE (resource)<-[:BELONGS_TO]-(claim:Claim {closed: false})
+            ON CREATE SET claim.id = randomUUID(), claim.createdAt = $createdAt, claim.updatedAt = claim.createdAt, claim.rule = 'latestReviewUpdatedAtRules', claim.disable = false, claim.closed = false
+            // Create report on claim
+            WITH submitter, resource, claim
+            CREATE (claim)<-[report:REPORTED {createdAt: $createdAt, reasonCategory: $reasonCategory, reasonDescription: $reasonDescription}]-(submitter)
 
-            RETURN submitter, report, caseFolder, resource, labels(resource)[0] AS type
+            RETURN submitter, report, claim, resource, labels(resource)[0] AS type
           `,
           {
             resourceId,
@@ -33,7 +33,7 @@ export default {
         return reportRelationshipTransactionResponse.records.map(record => ({
           submitter: record.get('submitter'),
           report: record.get('report'),
-          caseFolder: record.get('caseFolder'),
+          claim: record.get('claim'),
           resource: record.get('resource').properties,
           type: record.get('type'),
         }))
@@ -41,13 +41,13 @@ export default {
       try {
         const txResult = await writeTxResultPromise
         if (!txResult[0]) return null
-        const { submitter, report, caseFolder, resource, type } = txResult[0]
+        const { submitter, report, claim, resource, type } = txResult[0]
         createdRelationshipWithNestedAttributes = {
           ...report.properties,
-          caseFolderId: caseFolder.properties.id,
-          caseFolderUpdatedAt: caseFolder.properties.updatedAt,
-          caseFolderDisable: caseFolder.properties.disable,
-          caseFolderClosed: caseFolder.properties.closed,
+          claimId: claim.properties.id,
+          claimUpdatedAt: claim.properties.updatedAt,
+          claimDisable: claim.properties.disable,
+          claimClosed: claim.properties.closed,
           post: null,
           comment: null,
           user: null,
@@ -89,10 +89,10 @@ export default {
       }
       try {
         const cypher = `
-          MATCH (submitter:User)-[report:REPORTED]->(caseFolder:CaseFolder)-[:FLAGGED]->(resource)
-          // Wolle OPTIONAL MATCH (reviewer:User)-[:REVIEWED]->(caseFolder)
+          MATCH (submitter:User)-[report:REPORTED]->(claim:Claim)-[:BELONGS_TO]->(resource)
+          // Wolle OPTIONAL MATCH (reviewer:User)-[:REVIEWED]->(claim)
           WHERE resource:User OR resource:Post OR resource:Comment
-          RETURN submitter, report, caseFolder, resource, labels(resource)[0] as type
+          RETURN submitter, report, claim, resource, labels(resource)[0] as type
           ${orderByClause}
         `
         const result = await session.run(cypher, {})
@@ -100,7 +100,7 @@ export default {
           return {
             submitter: r.get('submitter'),
             report: r.get('report'),
-            caseFolder: r.get('caseFolder'),
+            claim: r.get('claim'),
             resource: r.get('resource'),
             type: r.get('type'),
           }
@@ -109,14 +109,14 @@ export default {
 
         response = []
         dbResponse.forEach(ele => {
-          const { report, submitter, caseFolder, resource, type } = ele
+          const { report, submitter, claim, resource, type } = ele
 
           const responseEle = {
             ...report.properties,
-            caseFolderId: caseFolder.properties.id,
-            caseFolderUpdatedAt: caseFolder.properties.updatedAt,
-            caseFolderDisable: caseFolder.properties.disable,
-            caseFolderClosed: caseFolder.properties.closed,
+            claimId: claim.properties.id,
+            claimUpdatedAt: claim.properties.updatedAt,
+            claimDisable: claim.properties.disable,
+            claimClosed: claim.properties.closed,
             post: null,
             comment: null,
             user: null,
@@ -154,6 +154,6 @@ export default {
     },
   },
   REPORTED: {
-    // Wolle ...undefinedToNullResolver(['caseFolderId', 'caseFolderDisable', 'caseFolderUpdatedAt', 'caseFolderClosed']),
+    // Wolle ...undefinedToNullResolver(['claimId', 'claimDisable', 'claimUpdatedAt', 'claimClosed']),
   },
 }
diff --git a/backend/src/schema/types/type/CaseFolder.gql b/backend/src/schema/types/type/Claim.gql
similarity index 51%
rename from backend/src/schema/types/type/CaseFolder.gql
rename to backend/src/schema/types/type/Claim.gql
index ad664302c..23e052308 100644
--- a/backend/src/schema/types/type/CaseFolder.gql
+++ b/backend/src/schema/types/type/Claim.gql
@@ -1,14 +1,12 @@
-type CaseFolder {
+type Claim {
   id: ID!
   createdAt: String!
   updatedAt: String!
-  rule: CaseRule!
+  rule: ClaimRule!
   disable: Boolean!
-  # reasonCategory: ReasonCategory!
-  # reasonDescription: String!
   closed: Boolean!
 }
 
-enum CaseRule {
+enum ClaimRule {
   latestReviewUpdatedAtRules
 }
diff --git a/backend/src/schema/types/type/Comment.gql b/backend/src/schema/types/type/Comment.gql
index dc92c1f9b..1f0404975 100644
--- a/backend/src/schema/types/type/Comment.gql
+++ b/backend/src/schema/types/type/Comment.gql
@@ -12,9 +12,9 @@ type Comment {
   reviewedByModerator: User
     @cypher(
       statement: """
-        MATCH (this)<-[:FLAGGED]-(caseFolder:CaseFolder)<-[review:REVIEWED]-(moderator:User)
+        MATCH (this)<-[:BELONGS_TO]-(claim:Claim)<-[review:REVIEWED]-(moderator:User)
         RETURN moderator
-        ORDER BY caseFolder.updatedAt DESC, review.updatedAt DESC
+        ORDER BY claim.updatedAt DESC, review.updatedAt DESC
         LIMIT 1
       """
     )
diff --git a/backend/src/schema/types/type/Post.gql b/backend/src/schema/types/type/Post.gql
index 307312900..dfcb7a0fc 100644
--- a/backend/src/schema/types/type/Post.gql
+++ b/backend/src/schema/types/type/Post.gql
@@ -124,9 +124,9 @@ type Post {
   reviewedByModerator: User
     @cypher(
       statement: """
-        MATCH (this)<-[:FLAGGED]-(caseFolder:CaseFolder)<-[review:REVIEWED]-(moderator:User)
+        MATCH (this)<-[:BELONGS_TO]-(claim:Claim)<-[review:REVIEWED]-(moderator:User)
         RETURN moderator
-        ORDER BY caseFolder.updatedAt DESC, review.updatedAt DESC
+        ORDER BY claim.updatedAt DESC, review.updatedAt DESC
         LIMIT 1
       """
     )
diff --git a/backend/src/schema/types/type/REPORTED.gql b/backend/src/schema/types/type/REPORTED.gql
index 1d630e42b..75395de89 100644
--- a/backend/src/schema/types/type/REPORTED.gql
+++ b/backend/src/schema/types/type/REPORTED.gql
@@ -3,10 +3,10 @@ type REPORTED {
   reasonCategory: ReasonCategory!
   reasonDescription: String!
 
-  caseFolderId: ID!
-  caseFolderDisable: Boolean!
-  caseFolderUpdatedAt: String!
-  caseFolderClosed: Boolean!
+  claimId: ID!
+  claimDisable: Boolean!
+  claimUpdatedAt: String!
+  claimClosed: Boolean!
 
   # Wolle decision: DECIDED
     # @cypher(statement: "MATCH (resource)<-[decision:DECIDED {uuid: $decisionUuid}]-(user:User) RETURN decision")
diff --git a/backend/src/schema/types/type/REVIEWED.gql b/backend/src/schema/types/type/REVIEWED.gql
index d3f064436..52819e7a9 100644
--- a/backend/src/schema/types/type/REVIEWED.gql
+++ b/backend/src/schema/types/type/REVIEWED.gql
@@ -5,7 +5,7 @@ type REVIEWED {
   # reasonDescription: String
   disable: Boolean!
   closed: Boolean!
-  caseFolderId: ID!
+  claimId: ID!
   # Wolle last: Boolean!
   
   moderator: User
diff --git a/backend/src/schema/types/type/User.gql b/backend/src/schema/types/type/User.gql
index 47635eeb1..13f9d0cd3 100644
--- a/backend/src/schema/types/type/User.gql
+++ b/backend/src/schema/types/type/User.gql
@@ -36,9 +36,9 @@ type User {
   reviewedByModerator: User
     @cypher(
       statement: """
-        MATCH (this)<-[:FLAGGED]-(caseFolder:CaseFolder)<-[review:REVIEWED]-(moderator:User)
+        MATCH (this)<-[:BELONGS_TO]-(claim:Claim)<-[review:REVIEWED]-(moderator:User)
         RETURN moderator
-        ORDER BY caseFolder.updatedAt DESC, review.updatedAt DESC
+        ORDER BY claim.updatedAt DESC, review.updatedAt DESC
         LIMIT 1
       """
     )
diff --git a/neo4j/change_disabled_relationship_to_case_node.sh b/neo4j/change_disabled_relationship_to_case_node.sh
index 7671825fc..15d7ce470 100755
--- a/neo4j/change_disabled_relationship_to_case_node.sh
+++ b/neo4j/change_disabled_relationship_to_case_node.sh
@@ -16,23 +16,23 @@ do
 done
 
 echo "
-// convert old DISABLED to new REVIEWED-CaseFolder-FLAGGED structure
+// convert old DISABLED to new REVIEWED-Claim-BELONGS_TO structure
 MATCH (moderator:User)-[disabled:DISABLED]->(disabledResource)
 WHERE disabledResource:User OR disabledResource:Comment OR disabledResource:Post
 DELETE disabled
-CREATE (moderator)-[review:REVIEWED]->(caseFolder:CaseFolder)-[:FLAGGED]->(disabledResource)
+CREATE (moderator)-[review:REVIEWED]->(claim:Claim)-[:BELONGS_TO]->(disabledResource)
 SET review.createdAt = toString(datetime()), review.updatedAt = review.createdAt, review.disable = true
-SET caseFolder.id = randomUUID(), caseFolder.createdAt = toString(datetime()), caseFolder.updatedAt = caseFolder.createdAt, caseFolder.rule = 'latestReviewUpdatedAtRules', caseFolder.disable = true, caseFolder.closed = false
+SET claim.id = randomUUID(), claim.createdAt = toString(datetime()), claim.updatedAt = claim.createdAt, claim.rule = 'latestReviewUpdatedAtRules', claim.disable = true, claim.closed = false
 
 // if disabledResource has no report, then create a moderators default report
-WITH moderator, disabledResource, caseFolder
+WITH moderator, disabledResource, claim
 OPTIONAL MATCH (disabledResourceReporter:User)-[existingReport:REPORTED]->(disabledResource)
 FOREACH(disabledResource IN CASE WHEN existingReport IS NULL THEN [1] ELSE [] END | 
-  CREATE (moderator)-[addModeratorReport:REPORTED]->(caseFolder)
+  CREATE (moderator)-[addModeratorReport:REPORTED]->(claim)
   SET addModeratorReport.createdAt = toString(datetime()), addModeratorReport.reasonCategory = 'other', addModeratorReport.reasonDescription = 'Old DISABLED relation had no now mandatory report !!! Created automatically to ensure database consistency! Creation date is when the database manipulation happened.'
 )
 FOREACH(disabledResource IN CASE WHEN existingReport IS NOT NULL THEN [1] ELSE [] END | 
-  CREATE (disabledResourceReporter)-[moveModeratorReport:REPORTED]->(caseFolder)
+  CREATE (disabledResourceReporter)-[moveModeratorReport:REPORTED]->(claim)
   SET moveModeratorReport = existingReport
   DELETE existingReport
 )
@@ -41,12 +41,12 @@ RETURN disabledResource {.id};
 " | cypher-shell
 
 echo "
-// for REPORTED resources without DISABLED relation which are handled above, create new REPORTED-CaseFolder-FLAGGED structure
+// for REPORTED resources without DISABLED relation which are handled above, create new REPORTED-Claim-BELONGS_TO structure
 MATCH (reporter:User)-[oldReport:REPORTED]->(notDisabledResource)
 WHERE notDisabledResource:User OR notDisabledResource:Comment OR notDisabledResource:Post
-MERGE (caseFolder:CaseFolder)-[:FLAGGED]->(notDisabledResource)
-ON CREATE SET caseFolder.id = randomUUID(), caseFolder.createdAt = toString(datetime()), caseFolder.updatedAt = caseFolder.createdAt, caseFolder.rule = 'latestReviewUpdatedAtRules', caseFolder.disable = false, caseFolder.closed = false
-CREATE (reporter)-[report:REPORTED]->(caseFolder)
+MERGE (claim:Claim)-[:BELONGS_TO]->(notDisabledResource)
+ON CREATE SET claim.id = randomUUID(), claim.createdAt = toString(datetime()), claim.updatedAt = claim.createdAt, claim.rule = 'latestReviewUpdatedAtRules', claim.disable = false, claim.closed = false
+CREATE (reporter)-[report:REPORTED]->(claim)
 SET report = oldReport
 DELETE oldReport
 
diff --git a/webapp/graphql/Moderation.js b/webapp/graphql/Moderation.js
index f11a52a8a..16e471144 100644
--- a/webapp/graphql/Moderation.js
+++ b/webapp/graphql/Moderation.js
@@ -8,10 +8,10 @@ export const reportListQuery = () => {
         createdAt
         reasonCategory
         reasonDescription
-        caseFolderId
-        caseFolderUpdatedAt
-        caseFolderDisable
-        caseFolderClosed
+        claimId
+        claimUpdatedAt
+        claimDisable
+        claimClosed
         type
         submitter {
           id
diff --git a/webapp/pages/moderation/index.vue b/webapp/pages/moderation/index.vue
index 033a617b1..82c6763c0 100644
--- a/webapp/pages/moderation/index.vue
+++ b/webapp/pages/moderation/index.vue
@@ -11,7 +11,7 @@
       <template v-for="content in reportedContentStructure">
         <thead
           :class="[
-            content.caseFolderClosed ? 'decision' : 'no-decision',
+            content.claimClosed ? 'decision' : 'no-decision',
             'ds-table-col',
             'ds-table-head-col',
             'ds-table-head-col-border',
@@ -88,8 +88,8 @@
               <span v-else>—</span>
             </td>
             <td class="ds-table-col ds-table-head-col-border">
-              <!-- caseFolderClosed -->
-              <b v-if="content.caseFolderClosed">
+              <!-- claimClosed -->
+              <b v-if="content.claimClosed">
                 {{ $t('moderation.reports.decided') }}
               </b>
               <ds-button
@@ -104,7 +104,7 @@
               <!-- reviewedByModerator -->
               <div v-if="content.resource.reviewedByModerator">
                 <br />
-                <div v-if="content.caseFolderDisable">
+                <div v-if="content.claimDisable">
                   <ds-icon name="eye-slash" class="ban" />
                   {{ $t('moderation.reports.disabledBy') }}
                 </div>
@@ -116,7 +116,7 @@
                   :user="content.resource.reviewedByModerator"
                   :showAvatar="false"
                   :trunc="30"
-                  :date-time="content.caseFolderUpdatedAt"
+                  :date-time="content.claimUpdatedAt"
                   positionDatetime="below"
                 />
               </div>
@@ -226,10 +226,10 @@ export default {
           if (idx === -1) {
             idx = newReportedContentStructure.length
             newReportedContentStructure.push({
-              caseFolderId: report.caseFolderId,
-              caseFolderUpdatedAt: report.caseFolderUpdatedAt,
-              caseFolderDisable: report.caseFolderDisable,
-              caseFolderClosed: report.caseFolderClosed,
+              claimId: report.claimId,
+              claimUpdatedAt: report.claimUpdatedAt,
+              claimDisable: report.claimDisable,
+              claimClosed: report.claimClosed,
               type: report.type,
               resource,
               user: report.user,
@@ -267,7 +267,7 @@ export default {
         'moderation.reports.decideModal.' +
         content.type +
         '.' +
-        (content.caseFolderDisable ? 'disable' : 'enable')
+        (content.claimDisable ? 'disable' : 'enable')
       this.$store.commit('modal/SET_OPEN', {
         name: 'confirm',
         data: {

From ec8910d6ebf7eb8a3a3a70fbf4ae3e1fa9e9ecc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Fri, 22 Nov 2019 15:12:00 +0100
Subject: [PATCH 054/174] Rename decide mutation to review

---
 .../src/middleware/permissionsMiddleware.js   |  2 +-
 .../softDelete/softDeleteMiddleware.spec.js   | 10 +--
 backend/src/schema/resolvers/moderation.js    | 31 ++++----
 .../src/schema/resolvers/moderation.spec.js   | 74 +++++++++----------
 .../schema/resolvers/user_management.spec.js  |  2 +-
 backend/src/schema/types/type/REPORTED.gql    | 10 +--
 backend/src/schema/types/type/REVIEWED.gql    | 11 ++-
 backend/src/seed/seed-db.js                   | 10 +--
 webapp/components/Modal/ConfirmModal.vue      |  1 +
 webapp/components/Modal/DisableModal.vue      |  3 +-
 webapp/components/Modal/ReportModal.vue       |  1 +
 .../components/ReleaseModal/ReleaseModal.vue  |  3 +-
 webapp/graphql/Moderation.js                  |  4 +-
 webapp/pages/moderation/index.vue             |  4 +-
 14 files changed, 84 insertions(+), 82 deletions(-)

diff --git a/backend/src/middleware/permissionsMiddleware.js b/backend/src/middleware/permissionsMiddleware.js
index f70dfeffa..dac3c58fa 100644
--- a/backend/src/middleware/permissionsMiddleware.js
+++ b/backend/src/middleware/permissionsMiddleware.js
@@ -147,7 +147,7 @@ const permissions = shield(
       shout: isAuthenticated,
       unshout: isAuthenticated,
       changePassword: isAuthenticated,
-      decide: isModerator,
+      review: isModerator,
       CreateComment: isAuthenticated,
       UpdateComment: isAuthor,
       DeleteComment: isAuthor,
diff --git a/backend/src/middleware/softDelete/softDeleteMiddleware.spec.js b/backend/src/middleware/softDelete/softDeleteMiddleware.spec.js
index 1e569b7f1..d5a4565fc 100644
--- a/backend/src/middleware/softDelete/softDeleteMiddleware.spec.js
+++ b/backend/src/middleware/softDelete/softDeleteMiddleware.spec.js
@@ -111,9 +111,9 @@ beforeAll(async () => {
   mutate = client.mutate
 
   authenticatedUser = await moderator.toJson()
-  const decideMutation = gql`
+  const reviewMutation = gql`
     mutation($resourceId: ID!, $disable: Boolean, $closed: Boolean) {
-      decide(resourceId: $resourceId, disable: $disable, closed: $closed) {
+      review(resourceId: $resourceId, disable: $disable, closed: $closed) {
         disable
       }
     }
@@ -124,9 +124,9 @@ beforeAll(async () => {
     closed: false,
   }
   await Promise.all([
-    mutate({ mutation: decideMutation, variables: { ...disableVariables, resourceId: 'c1' } }),
-    mutate({ mutation: decideMutation, variables: { ...disableVariables, resourceId: 'u2' } }),
-    mutate({ mutation: decideMutation, variables: { ...disableVariables, resourceId: 'p2' } }),
+    mutate({ mutation: reviewMutation, variables: { ...disableVariables, resourceId: 'c1' } }),
+    mutate({ mutation: reviewMutation, variables: { ...disableVariables, resourceId: 'u2' } }),
+    mutate({ mutation: reviewMutation, variables: { ...disableVariables, resourceId: 'p2' } }),
   ])
   authenticatedUser = null
 })
diff --git a/backend/src/schema/resolvers/moderation.js b/backend/src/schema/resolvers/moderation.js
index 594ca4b3c..b0572dd89 100644
--- a/backend/src/schema/resolvers/moderation.js
+++ b/backend/src/schema/resolvers/moderation.js
@@ -25,14 +25,15 @@
 
 export default {
   Mutation: {
-    decide: async (_object, params, context, _resolveInfo) => {
-      // Wolle console.log('params: ', params)
+    review: async (_object, params, context, _resolveInfo) => {
       const { resourceId } = params
-      // Wolle console.log('resourceId: ', resourceId)
       let { disable, closed } = params
+      // Wolle console.log('disable: ', disable)
+      // console.log('closed: ', closed)
       disable = disable === undefined ? null : disable
       closed = closed === undefined ? null : closed
       // Wolle console.log('disable: ', disable)
+      // console.log('closed: ', closed)
       const { user: moderator, driver } = context
 
       let createdRelationshipWithNestedAttributes = null // return value
@@ -134,10 +135,10 @@ export default {
             MERGE (claim)<-[review:REVIEWED]-(moderator)
             ON CREATE SET review.createdAt = $dateTime, review.updatedAt = review.createdAt,
               review.disable = CASE WHEN $disable IS NULL
-                THEN false
+                THEN claim.disable
                 ELSE $disable END,
               review.closed = CASE WHEN $closed IS NULL
-                THEN false
+                THEN claim.closed
                 ELSE $closed END
             ON MATCH SET
               review.updatedAt = $dateTime,
@@ -151,7 +152,7 @@ export default {
             SET claim.disable = review.disable, claim.closed = review.closed
             SET resource.disabled = review.disable
 
-            RETURN moderator, review, claim {.id}, resource, labels(resource)[0] AS type
+            RETURN moderator, review, claim, resource, labels(resource)[0] AS type
           `
 
         // Wolle console.log('cypher: ', cypher)
@@ -191,18 +192,18 @@ export default {
         })
         const txResult = await mutateDecisionWriteTxResultPromise
         if (!txResult[0]) return null
-        // const { decision, resource, moderator: moderatorInResult, type } = txResult[0]
-        // createdRelationshipWithNestedAttributes = {
-        //   ...decision.properties,
-        //   moderator: moderatorInResult.properties,
-        //   type,
-        //   post: null,
-        //   comment: null,
-        //   user: null,
-        // }
         const { moderator: moderatorInResult, review, claim, resource, type } = txResult[0]
+        // Wolle console.log('review.properties.disable: ', review.properties.disable)
+        // console.log('claim.properties.disable: ', claim.properties.disable)
+        // console.log('resource.properties.disabled: ', resource.properties.disabled)
+        // console.log('review.properties.closed: ', review.properties.closed)
+        // console.log('claim.properties.closed: ', claim.properties.closed)
         createdRelationshipWithNestedAttributes = {
           ...review.properties,
+          claimId: claim.properties.id,
+          claimUpdatedAt: claim.properties.updatedAt,
+          claimDisable: claim.properties.disable,
+          claimClosed: claim.properties.closed,
           moderator: moderatorInResult.properties,
           claimId: claim.id,
           type,
diff --git a/backend/src/schema/resolvers/moderation.spec.js b/backend/src/schema/resolvers/moderation.spec.js
index e819e74d1..24d2ff280 100644
--- a/backend/src/schema/resolvers/moderation.spec.js
+++ b/backend/src/schema/resolvers/moderation.spec.js
@@ -17,9 +17,9 @@ let query,
   moderator,
   nonModerator
 
-const decideMutation = gql`
+const reviewMutation = gql`
   mutation($resourceId: ID!, $disable: Boolean, $closed: Boolean) {
-    decide(resourceId: $resourceId, disable: $disable, closed: $closed) {
+    review(resourceId: $resourceId, disable: $disable, closed: $closed) {
       post {
         id
       }
@@ -96,11 +96,11 @@ describe('moderate resources', () => {
     await factory.cleanDatabase()
   })
 
-  describe('decide to disable', () => {
+  describe('review to disable', () => {
     describe('unauthenticated', () => {
       it('throws authorization error', async () => {
         await expect(
-          mutate({ mutation: decideMutation, variables: disableVariables }),
+          mutate({ mutation: reviewMutation, variables: disableVariables }),
         ).resolves.toMatchObject({
           errors: [{ message: 'Not Authorised!' }],
         })
@@ -121,7 +121,7 @@ describe('moderate resources', () => {
 
         it('throws authorization error', async () => {
           await expect(
-            mutate({ mutation: decideMutation, variables: disableVariables }),
+            mutate({ mutation: reviewMutation, variables: disableVariables }),
           ).resolves.toMatchObject({
             errors: [{ message: 'Not Authorised!' }],
           })
@@ -144,9 +144,9 @@ describe('moderate resources', () => {
 
           it('returns null', async () => {
             await expect(
-              mutate({ mutation: decideMutation, variables: disableVariables }),
+              mutate({ mutation: reviewMutation, variables: disableVariables }),
             ).resolves.toMatchObject({
-              data: { decide: null },
+              data: { review: null },
             })
           })
         })
@@ -165,9 +165,9 @@ describe('moderate resources', () => {
               resourceId: 'comment-id',
             }
             await expect(
-              mutate({ mutation: decideMutation, variables: disableVariables }),
+              mutate({ mutation: reviewMutation, variables: disableVariables }),
             ).resolves.toMatchObject({
-              data: { decide: { comment: { id: 'comment-id' } } },
+              data: { review: { comment: { id: 'comment-id' } } },
               errors: undefined,
             })
           })
@@ -190,9 +190,9 @@ describe('moderate resources', () => {
               query({ query: commentQuery, variables: resourceVariables }),
             ).resolves.toMatchObject(before)
             await expect(
-              mutate({ mutation: decideMutation, variables: disableVariables }),
+              mutate({ mutation: reviewMutation, variables: disableVariables }),
             ).resolves.toMatchObject({
-              data: { decide: { comment: { id: 'comment-id' } } },
+              data: { review: { comment: { id: 'comment-id' } } },
             })
             await expect(
               query({ query: commentQuery, variables: resourceVariables }),
@@ -214,9 +214,9 @@ describe('moderate resources', () => {
               query({ query: commentQuery, variables: resourceVariables }),
             ).resolves.toMatchObject(before)
             await expect(
-              mutate({ mutation: decideMutation, variables: disableVariables }),
+              mutate({ mutation: reviewMutation, variables: disableVariables }),
             ).resolves.toMatchObject({
-              data: { decide: { comment: { id: 'comment-id' } } },
+              data: { review: { comment: { id: 'comment-id' } } },
             })
             await expect(
               query({ query: commentQuery, variables: resourceVariables }),
@@ -237,9 +237,9 @@ describe('moderate resources', () => {
               resourceId: 'sample-post-id',
             }
             await expect(
-              mutate({ mutation: decideMutation, variables: disableVariables }),
+              mutate({ mutation: reviewMutation, variables: disableVariables }),
             ).resolves.toMatchObject({
-              data: { decide: { post: { id: 'sample-post-id' } } },
+              data: { review: { post: { id: 'sample-post-id' } } },
             })
           })
 
@@ -262,9 +262,9 @@ describe('moderate resources', () => {
               query({ query: postQuery, variables: resourceVariables }),
             ).resolves.toMatchObject(before)
             await expect(
-              mutate({ mutation: decideMutation, variables: disableVariables }),
+              mutate({ mutation: reviewMutation, variables: disableVariables }),
             ).resolves.toMatchObject({
-              data: { decide: { post: { id: 'sample-post-id' } } },
+              data: { review: { post: { id: 'sample-post-id' } } },
             })
             await expect(
               query({ query: postQuery, variables: resourceVariables }),
@@ -286,9 +286,9 @@ describe('moderate resources', () => {
               query({ query: postQuery, variables: resourceVariables }),
             ).resolves.toMatchObject(before)
             await expect(
-              mutate({ mutation: decideMutation, variables: disableVariables }),
+              mutate({ mutation: reviewMutation, variables: disableVariables }),
             ).resolves.toMatchObject({
-              data: { decide: { post: { id: 'sample-post-id' } } },
+              data: { review: { post: { id: 'sample-post-id' } } },
             })
             await expect(
               query({ query: postQuery, variables: resourceVariables }),
@@ -307,7 +307,7 @@ describe('moderate resources', () => {
           resourceId: 'sample-post-id',
         }
         await expect(
-          mutate({ mutation: decideMutation, variables: enableVariables }),
+          mutate({ mutation: reviewMutation, variables: enableVariables }),
         ).resolves.toMatchObject({
           errors: [{ message: 'Not Authorised!' }],
         })
@@ -332,7 +332,7 @@ describe('moderate resources', () => {
             resourceId: 'sample-post-id',
           }
           await expect(
-            mutate({ mutation: decideMutation, variables: enableVariables }),
+            mutate({ mutation: reviewMutation, variables: enableVariables }),
           ).resolves.toMatchObject({
             errors: [{ message: 'Not Authorised!' }],
           })
@@ -355,9 +355,9 @@ describe('moderate resources', () => {
               resourceId: 'sample-tag-id',
             }
             await expect(
-              mutate({ mutation: decideMutation, variables: enableVariables }),
+              mutate({ mutation: reviewMutation, variables: enableVariables }),
             ).resolves.toMatchObject({
-              data: { decide: null },
+              data: { review: null },
             })
           })
         })
@@ -378,14 +378,14 @@ describe('moderate resources', () => {
             await factory.create('Comment', {
               id: 'comment-id',
             })
-            await mutate({ mutation: decideMutation, variables: disableVariables })
+            await mutate({ mutation: reviewMutation, variables: disableVariables })
           })
 
           it('returns enabled resource id', async () => {
             await expect(
-              mutate({ mutation: decideMutation, variables: enableVariables }),
+              mutate({ mutation: reviewMutation, variables: enableVariables }),
             ).resolves.toMatchObject({
-              data: { decide: { comment: { id: 'comment-id' } } },
+              data: { review: { comment: { id: 'comment-id' } } },
             })
           })
 
@@ -397,9 +397,9 @@ describe('moderate resources', () => {
             }
 
             await expect(
-              mutate({ mutation: decideMutation, variables: enableVariables }),
+              mutate({ mutation: reviewMutation, variables: enableVariables }),
             ).resolves.toMatchObject({
-              data: { decide: { comment: { id: 'comment-id' } } },
+              data: { review: { comment: { id: 'comment-id' } } },
             })
             await expect(
               query({ query: commentQuery, variables: resourceVariables }),
@@ -412,9 +412,9 @@ describe('moderate resources', () => {
             }
 
             await expect(
-              mutate({ mutation: decideMutation, variables: enableVariables }),
+              mutate({ mutation: reviewMutation, variables: enableVariables }),
             ).resolves.toMatchObject({
-              data: { decide: { comment: { id: 'comment-id' } } },
+              data: { review: { comment: { id: 'comment-id' } } },
             })
             await expect(
               query({ query: commentQuery, variables: resourceVariables }),
@@ -436,14 +436,14 @@ describe('moderate resources', () => {
             await factory.create('Post', {
               id: 'post-id',
             })
-            await mutate({ mutation: decideMutation, variables: disableVariables })
+            await mutate({ mutation: reviewMutation, variables: disableVariables })
           })
 
           it('returns enabled resource id', async () => {
             await expect(
-              mutate({ mutation: decideMutation, variables: enableVariables }),
+              mutate({ mutation: reviewMutation, variables: enableVariables }),
             ).resolves.toMatchObject({
-              data: { decide: { post: { id: 'post-id' } } },
+              data: { review: { post: { id: 'post-id' } } },
             })
           })
 
@@ -452,9 +452,9 @@ describe('moderate resources', () => {
               data: { Post: [{ id: 'post-id', reviewedByModerator: { id: 'moderator-id' } }] },
             }
             await expect(
-              mutate({ mutation: decideMutation, variables: enableVariables }),
+              mutate({ mutation: reviewMutation, variables: enableVariables }),
             ).resolves.toMatchObject({
-              data: { decide: { post: { id: 'post-id' } } },
+              data: { review: { post: { id: 'post-id' } } },
             })
             await expect(
               query({ query: postQuery, variables: resourceVariables }),
@@ -467,9 +467,9 @@ describe('moderate resources', () => {
             }
 
             await expect(
-              mutate({ mutation: decideMutation, variables: enableVariables }),
+              mutate({ mutation: reviewMutation, variables: enableVariables }),
             ).resolves.toMatchObject({
-              data: { decide: { post: { id: 'post-id' } } },
+              data: { review: { post: { id: 'post-id' } } },
             })
             await expect(
               query({ query: postQuery, variables: resourceVariables }),
diff --git a/backend/src/schema/resolvers/user_management.spec.js b/backend/src/schema/resolvers/user_management.spec.js
index 79dcb1c76..8b12b4939 100644
--- a/backend/src/schema/resolvers/user_management.spec.js
+++ b/backend/src/schema/resolvers/user_management.spec.js
@@ -20,7 +20,7 @@ const disable = async id => {
   await mutate({
     mutation: gql`
       mutation($resourceId: ID!, $disable: Boolean, $closed: Boolean) {
-        decide(resourceId: $resourceId, disable: $disable, closed: $closed) {
+        review(resourceId: $resourceId, disable: $disable, closed: $closed) {
           disable
         }
       }
diff --git a/backend/src/schema/types/type/REPORTED.gql b/backend/src/schema/types/type/REPORTED.gql
index 75395de89..c05df094d 100644
--- a/backend/src/schema/types/type/REPORTED.gql
+++ b/backend/src/schema/types/type/REPORTED.gql
@@ -8,16 +8,10 @@ type REPORTED {
   claimUpdatedAt: String!
   claimClosed: Boolean!
 
-  # Wolle decision: DECIDED
-    # @cypher(statement: "MATCH (resource)<-[decision:DECIDED {uuid: $decisionUuid}]-(user:User) RETURN decision")
-
   submitter: User
-    @cypher(statement: "MATCH (resource)<-[:REPORTED]-(user:User) RETURN user")
-  # not yet supported
-  # resource: ReportResource
-  #   @cypher(statement: "MATCH (resource)<-[:REPORTED]-(user:User) RETURN resource")
+    # @cypher(statement: "MATCH (resource)<-[:REPORTED]-(user:User) RETURN user")
   type: String
-    @cypher(statement: "MATCH (resource)<-[:REPORTED]-(user:User) RETURN labels(resource)[0]")
+    # @cypher(statement: "MATCH (resource)<-[:REPORTED]-(user:User) RETURN labels(resource)[0]")
   user: User
   post: Post
   comment: Comment
diff --git a/backend/src/schema/types/type/REVIEWED.gql b/backend/src/schema/types/type/REVIEWED.gql
index 52819e7a9..ce8aebf3d 100644
--- a/backend/src/schema/types/type/REVIEWED.gql
+++ b/backend/src/schema/types/type/REVIEWED.gql
@@ -5,13 +5,16 @@ type REVIEWED {
   # reasonDescription: String
   disable: Boolean!
   closed: Boolean!
+
   claimId: ID!
-  # Wolle last: Boolean!
+  claimDisable: Boolean!
+  claimUpdatedAt: String!
+  claimClosed: Boolean!
   
   moderator: User
-    # @cypher(statement: "MATCH (resource)<-[:DECIDED]-(moderator:User) RETURN moderator")
+    # Wolle @cypher(statement: "MATCH (resource)<-[:DECIDED]-(moderator:User) RETURN moderator")
   # not yet supported
-  # resource: ReportResource
+  # Wolle resource: ReportResource
   #   @cypher(statement: "MATCH (resource)<-[:DECIDED]-(:User) RETURN resource")
   type: String
     # @cypher(statement: "MATCH (resource)<-[:DECIDED]-(user:User) RETURN labels(resource)[0]")
@@ -21,5 +24,5 @@ type REVIEWED {
 }
 
 type Mutation {
-  decide(resourceId: ID!, disable: Boolean, closed: Boolean): REVIEWED
+  review(resourceId: ID!, disable: Boolean, closed: Boolean): REVIEWED
 }
diff --git a/backend/src/seed/seed-db.js b/backend/src/seed/seed-db.js
index b2423f7a6..990b749c3 100644
--- a/backend/src/seed/seed-db.js
+++ b/backend/src/seed/seed-db.js
@@ -737,10 +737,10 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
     ])
     authenticatedUser = null
 
-    // only decide after report !!!
-    const decideMutation = gql`
+    // only review after report !!!
+    const reviewMutation = gql`
       mutation($resourceId: ID!, $disable: Boolean, $closed: Boolean) {
-        decide(resourceId: $resourceId, disable: $disable, closed: $closed) {
+        review(resourceId: $resourceId, disable: $disable, closed: $closed) {
           disable
         }
       }
@@ -753,14 +753,14 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
     authenticatedUser = await bobDerBaumeister.toJson()
     await Promise.all([
       mutate({
-        mutation: decideMutation,
+        mutation: reviewMutation,
         variables: {
           ...disableVariables,
           resourceId: 'p11',
         },
       }),
       mutate({
-        mutation: decideMutation,
+        mutation: reviewMutation,
         variables: {
           ...disableVariables,
           resourceId: 'c5',
diff --git a/webapp/components/Modal/ConfirmModal.vue b/webapp/components/Modal/ConfirmModal.vue
index 147258849..71f0dc40e 100644
--- a/webapp/components/Modal/ConfirmModal.vue
+++ b/webapp/components/Modal/ConfirmModal.vue
@@ -78,6 +78,7 @@ export default {
         }, 1500)
       } catch (err) {
         this.success = false
+        this.isOpen = false
       } finally {
         this.loading = false
       }
diff --git a/webapp/components/Modal/DisableModal.vue b/webapp/components/Modal/DisableModal.vue
index a231b4e2b..d80ec0f55 100644
--- a/webapp/components/Modal/DisableModal.vue
+++ b/webapp/components/Modal/DisableModal.vue
@@ -55,7 +55,7 @@ export default {
         await this.$apollo.mutate({
           mutation: gql`
             mutation($resourceId: ID!, $disable: Boolean, $closed: Boolean) {
-              decide(resourceId: $resourceId, disable: $disable, closed: $closed) {
+              review(resourceId: $resourceId, disable: $disable, closed: $closed) {
                 disable
               }
             }
@@ -69,6 +69,7 @@ export default {
         }, 1000)
       } catch (err) {
         this.$toast.error(err.message)
+        this.isOpen = false
       }
     },
   },
diff --git a/webapp/components/Modal/ReportModal.vue b/webapp/components/Modal/ReportModal.vue
index 9b155e8b6..00fed2646 100644
--- a/webapp/components/Modal/ReportModal.vue
+++ b/webapp/components/Modal/ReportModal.vue
@@ -149,6 +149,7 @@ export default {
             default:
               this.$toast.error(err.message)
           }
+          this.isOpen = false
           this.loading = false
         })
     },
diff --git a/webapp/components/ReleaseModal/ReleaseModal.vue b/webapp/components/ReleaseModal/ReleaseModal.vue
index f098dd2c4..82f800ddb 100644
--- a/webapp/components/ReleaseModal/ReleaseModal.vue
+++ b/webapp/components/ReleaseModal/ReleaseModal.vue
@@ -54,7 +54,7 @@ export default {
         await this.$apollo.mutate({
           mutation: gql`
             mutation($resourceId: ID!, $disable: Boolean, $closed: Boolean) {
-              decide(resourceId: $resourceId, disable: $disable, closed: $closed) {
+              review(resourceId: $resourceId, disable: $disable, closed: $closed) {
                 disable
               }
             }
@@ -68,6 +68,7 @@ export default {
         }, 1000)
       } catch (err) {
         this.$toast.error(err.message)
+        this.isOpen = false
       }
     },
   },
diff --git a/webapp/graphql/Moderation.js b/webapp/graphql/Moderation.js
index 16e471144..3300f2915 100644
--- a/webapp/graphql/Moderation.js
+++ b/webapp/graphql/Moderation.js
@@ -111,10 +111,10 @@ export const reportMutation = () => {
   `
 }
 
-export const decideMutation = () => {
+export const reviewMutation = () => {
   return gql`
     mutation($resourceId: ID!, $disable: Boolean, $closed: Boolean) {
-      decide(resourceId: $resourceId, disable: $disable, closed: $closed) {
+      review(resourceId: $resourceId, disable: $disable, closed: $closed) {
         disable
       }
     }
diff --git a/webapp/pages/moderation/index.vue b/webapp/pages/moderation/index.vue
index 82c6763c0..9478bd886 100644
--- a/webapp/pages/moderation/index.vue
+++ b/webapp/pages/moderation/index.vue
@@ -168,7 +168,7 @@
 <script>
 import HcEmpty from '~/components/Empty/Empty'
 import HcUser from '~/components/User/User'
-import { reportListQuery, decideMutation } from '~/graphql/Moderation.js'
+import { reportListQuery, reviewMutation } from '~/graphql/Moderation.js'
 
 export default {
   components: {
@@ -253,7 +253,7 @@ export default {
     async confirmCallback(resourceId) {
       this.$apollo
         .mutate({
-          mutation: decideMutation(),
+          mutation: reviewMutation(),
           variables: { resourceId, closed: true },
         })
         .then(() => {

From 9a7774ce860c6075406ab3203442c4fd745ca891 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Fri, 22 Nov 2019 15:19:49 +0100
Subject: [PATCH 055/174] Implement review validation with validateReview

---
 .../validation/validationMiddleware.js        | 62 +++++++++++--------
 1 file changed, 36 insertions(+), 26 deletions(-)

diff --git a/backend/src/middleware/validation/validationMiddleware.js b/backend/src/middleware/validation/validationMiddleware.js
index 1e48e590d..a50100d12 100644
--- a/backend/src/middleware/validation/validationMiddleware.js
+++ b/backend/src/middleware/validation/validationMiddleware.js
@@ -64,8 +64,9 @@ const validateReport = async (resolve, root, args, context, info) => {
   const session = driver.session()
   const reportQueryRes = await session.run(
     `
-      MATCH (:User {id:$submitterId})-[:REPORTED]->(resource {id:$resourceId}) 
-      RETURN labels(resource)[0] as label
+      MATCH (:User {id: $submitterId})-[:REPORTED]->(:Claim {closed: false})-[:BELONGS_TO]->(resource {id: $resourceId}) 
+      WHERE resource:User OR resource:Post OR resource:Comment
+      RETURN labels(resource)[0] AS label
     `,
     {
       resourceId,
@@ -83,30 +84,39 @@ const validateReport = async (resolve, root, args, context, info) => {
   return resolve(root, args, context, info)
 }
 
-// const validateDecide = async (resolve, root, args, context, info) => {
-//   const { resourceId } = args
-//   const { user, driver } = context
-//   if (resourceId === user.id) throw new Error('You cannot report yourself!')
-//   const session = driver.session()
-//   const reportQueryRes = await session.run(
-//     `
-//       MATCH (:User {id:$submitterId})-[:REPORTED]->(resource {id:$resourceId})
-//       RETURN labels(resource)[0] as label
-//     `,
-//     {
-//       resourceId,
-//       submitterId: user.id,
-//     },
-//   )
-//   const [existingReportedResource] = reportQueryRes.records.map(record => {
-//     return {
-//       label: record.get('label'),
-//     }
-//   })
+const validateReview = async (resolve, root, args, context, info) => {
+  const { resourceId } = args
+  const { user, driver } = context
+  if (resourceId === user.id) throw new Error('You can not review yourself!')
+  const session = driver.session()
+  const reportQueryRes = await session.run(
+    `
+      MATCH (resource {id: $resourceId})
+      WHERE resource:User OR resource:Post OR resource:Comment
+      OPTIONAL MATCH (:User)-[report:REPORTED]->(:Claim {closed: false})-[:BELONGS_TO]->(resource)
+      OPTIONAL MATCH (resource)<-[:WROTE]-(author:User)
+      RETURN labels(resource)[0] AS label, author, report
+    `,
+    {
+      resourceId,
+      submitterId: user.id,
+    },
+  )
+  session.close()
+  const [existingReportedResource] = reportQueryRes.records.map(record => {
+    return {
+      label: record.get('label'),
+      author: record.get('author'),
+      report: record.get('report'),
+    }
+  })
 
-//   if (existingReportedResource) throw new Error(`${existingReportedResource.label}`)
-//   return resolve(root, args, context, info)
-// }
+  if (!existingReportedResource) throw new Error(`Resource not found!`)
+  if (!existingReportedResource.report) throw new Error(`Before you can start the reviewing process, please report the ${existingReportedResource.label}!`)
+  const authorId = existingReportedResource.label !== 'User' && existingReportedResource.author ? existingReportedResource.author.id : null
+  if (authorId && resourceId === authorId) throw new Error(`You cannot review your own ${existingReportedResource.label}!`)
+  return resolve(root, args, context, info)
+}
 
 export default {
   Mutation: {
@@ -115,6 +125,6 @@ export default {
     CreatePost: validatePost,
     UpdatePost: validateUpdatePost,
     report: validateReport,
-    // decide: validateDecide,
+    review: validateReview,
   },
 }

From 59f53a07c6ac9ddaf37be0bd400af8ce6f72af16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Fri, 22 Nov 2019 15:24:50 +0100
Subject: [PATCH 056/174] Clean up

---
 backend/src/models/Comment.js                 |   6 -
 backend/src/models/Post.js                    |   6 -
 backend/src/models/User.js                    |   6 -
 backend/src/schema/resolvers/moderation.js    | 127 ------------------
 .../src/schema/resolvers/moderation.spec.js   |   1 -
 backend/src/schema/resolvers/reports.js       |  17 +--
 backend/src/schema/types/type/REVIEWED.gql    |   5 -
 7 files changed, 1 insertion(+), 167 deletions(-)

diff --git a/backend/src/models/Comment.js b/backend/src/models/Comment.js
index 06ebe2930..54cbda675 100644
--- a/backend/src/models/Comment.js
+++ b/backend/src/models/Comment.js
@@ -25,12 +25,6 @@ module.exports = {
     target: 'User',
     direction: 'in',
   },
-  // Wolle reviewedByModerator: {
-  //   type: 'relationship',
-  //   relationship: 'DECIDED',
-  //   target: 'User',
-  //   direction: 'in',
-  // },
   notified: {
     type: 'relationship',
     relationship: 'NOTIFIED',
diff --git a/backend/src/models/Post.js b/backend/src/models/Post.js
index 695664a56..59fd31f35 100644
--- a/backend/src/models/Post.js
+++ b/backend/src/models/Post.js
@@ -17,12 +17,6 @@ module.exports = {
   image: { type: 'string', allow: [null] },
   deleted: { type: 'boolean', default: false },
   disabled: { type: 'boolean', default: false },
-  // Wolle reviewedByModerator: {
-  //   type: 'relationship',
-  //   relationship: 'DECIDED',
-  //   target: 'User',
-  //   direction: 'in',
-  // },
   notified: {
     type: 'relationship',
     relationship: 'NOTIFIED',
diff --git a/backend/src/models/User.js b/backend/src/models/User.js
index 719e0e664..32f053e2b 100644
--- a/backend/src/models/User.js
+++ b/backend/src/models/User.js
@@ -42,12 +42,6 @@ module.exports = {
     },
   },
   friends: { type: 'relationship', relationship: 'FRIENDS', target: 'User', direction: 'both' },
-  // Wolle reviewedByModerator: {
-  //   type: 'relationship',
-  //   relationship: 'DECIDED',
-  //   target: 'User',
-  //   direction: 'in',
-  // },
   rewarded: {
     type: 'relationship',
     relationship: 'REWARDED',
diff --git a/backend/src/schema/resolvers/moderation.js b/backend/src/schema/resolvers/moderation.js
index b0572dd89..84a360baf 100644
--- a/backend/src/schema/resolvers/moderation.js
+++ b/backend/src/schema/resolvers/moderation.js
@@ -1,28 +1,3 @@
-// Wolle import { undefinedToNullResolver } from './helpers/Resolver'
-
-// Wolle const queryOpenDecisionWriteTransaction = (session, resourceId) => {
-//   return session.writeTransaction(async txc => {
-//     const queryOpenDecisionTransactionResponse = await txc.run(
-//       `
-//         //MATCH (moderator:User)-[decision:DECIDED {closed: false}]->(resource {id: $resourceId})
-//         //WHERE resource:User OR resource:Comment OR resource:Post
-//         //RETURN decision, moderator {.id} AS decisionModerator
-
-//         // Wolle only review on reported resources
-
-//         MATCH (caseModerator:User)-[:REPORTED]->(claim:Claim {closed: false})-[:BELONGS_TO]->(resource {id: $resourceId})
-//         WHERE resource:User OR resource:Post OR resource:Comment
-//         RETURN claim, caseModerator {.id}
-//       `,
-//       { resourceId },
-//     )
-//     return queryOpenDecisionTransactionResponse.records.map(record => ({
-//       claim: record.get('claim'),
-//       caseModerator: record.get('caseModerator'),
-//     }))
-//   })
-// }
-
 export default {
   Mutation: {
     review: async (_object, params, context, _resolveInfo) => {
@@ -40,89 +15,10 @@ export default {
 
       const session = driver.session()
       try {
-        // const queryOpenDecisionWriteTxResultPromise = queryOpenDecisionWriteTransaction(
-        //   session,
-        //   resourceId,
-        // )
-        // console.log('queryOpenDecisionWriteTxResultPromise: ', queryOpenDecisionWriteTxResultPromise)
-        // console.log('queryOpenDecisionWriteTxResultPromise: ', queryOpenDecisionWriteTxResultPromise)
-        // console.log('queryOpenDecisionWriteTxResultPromise: ', queryOpenDecisionWriteTxResultPromise)
-        // console.log('queryOpenDecisionWriteTxResultPromise: ', queryOpenDecisionWriteTxResultPromise)
-        // console.log('queryOpenDecisionWriteTxResultPromise: ', queryOpenDecisionWriteTxResultPromise)
-        // const [openDecisionTxResult] = await queryOpenDecisionWriteTxResultPromise
-
-        // let cypherHeader = ''
-
-        // // Wolle openDecisionTxResult should not be undefined !!!
-        // if (!openDecisionTxResult) {
-        //   // no open claim, then create one
-        //   if (disable === undefined) disable = false // default for creation
-        //   if (closed === undefined) closed = false // default for creation
-        //   cypherHeader = `
-        //       MATCH (resource {id: $resourceId})
-        //       WHERE resource: User OR resource: Comment OR resource: Post
-        //       OPTIONAL MATCH (:User)-[lastDecision:DECIDED {latest: true}]->(resource)
-        //       SET (CASE WHEN lastDecision IS NOT NULL THEN lastDecision END).latest = false
-        //       WITH resource
-        //       MATCH (moderator:User {id: $moderatorId})
-        //       CREATE (resource)<-[decision:DECIDED]-(moderator)
-        //       SET decision.latest = true
-        //       `
-        // } else {
-        //   // an open claim, then change it
-        //   if (disable === undefined) disable = openDecisionTxResult.claim.properties.disable // default set to existing
-        //   if (closed === undefined) closed = openDecisionTxResult.claim.properties.closed // default set to existing
-        //   // current moderator is not the same as old
-        //   if (moderator.id !== openDecisionTxResult.caseModerator.id) {
-        //     // from a different moderator, then create relation with properties to new moderator
-        //     cypherHeader = `
-        //         MATCH (moderator:User)-[oldDecision:DECIDED {closed: false}]->(resource {id: $resourceId})
-        //         WHERE resource:User OR resource:Comment OR resource:Post
-        //         DELETE oldDecision
-        //         MATCH (moderator:User {id: $moderatorId})
-        //         MATCH (resource {id: $resourceId})
-        //         WHERE resource:User OR resource:Comment OR resource:Post
-        //         CREATE (resource)<-[decision:DECIDED]-(moderator)
-        //         SET decision = oldDecision
-        //       `
-        //   } else {
-        //     // an open claim from same moderator, then match this
-        //     cypherHeader = `
-        //         MATCH (moderator:User)-[decision:DECIDED {closed: false}]->(resource {id: $resourceId})
-        //         WHERE resource:User OR resource:Comment OR resource:Post
-        //       `
-        //   }
-        // }
-        // let decisionUUID = null
-        // let cypherClosed = ''
-        // if (closed) {
-        //   decisionUUID = uuid()
-        //   cypherClosed = `
-        //       WITH decision, resource, moderator
-        //       OPTIONAL MATCH (:User)-[report:REPORTED {closed: false}]->(resource)
-        //       SET (CASE WHEN report IS NOT NULL THEN report END).closed = true
-        //       SET (CASE WHEN report IS NOT NULL THEN report END).decisionUuid = $decisionUUID
-        //       SET decision.uuid = $decisionUUID
-        //     `
-        // }
-        // const cypher =
-        //   cypherHeader +
-        //   `SET decision.updatedAt = toString(datetime())
-        //     SET (CASE WHEN decision.createdAt IS NULL THEN decision END).createdAt = decision.updatedAt
-        //     SET decision.disable = $disable, decision.closed = $closed
-        //     SET resource.disabled = $disable
-        //   ` +
-        //   cypherClosed +
-        //   `RETURN decision, resource, moderator, labels(resource)[0] AS type
-        //   `
         const cypher = ` 
-            // Wolle only review on reported resources
-
             MATCH (moderator:User {id: $moderatorId})
             MATCH (resource {id: $resourceId})
             WHERE resource:User OR resource:Post OR resource:Comment
-            // report exists?
-            //WHERE (claim)<-[report:REPORTED]-(submitter:User)
 
             // no open claim, create one, update existing
             MERGE (resource)<-[:BELONGS_TO]-(claim:Claim {closed: false})
@@ -154,26 +50,6 @@ export default {
 
             RETURN moderator, review, claim, resource, labels(resource)[0] AS type
           `
-
-        // Wolle console.log('cypher: ', cypher)
-        // console.log('disable: ', disable)
-
-        // const mutateDecisionWriteTxResultPromise = session.writeTransaction(async txc => {
-        //   const mutateDecisionTransactionResponse = await txc.run(
-        //     cypher, {
-        //     resourceId,
-        //     moderatorId: moderator.id,
-        //     disable,
-        //     closed,
-        //     decisionUUID,
-        //   })
-        //   return mutateDecisionTransactionResponse.records.map(record => ({
-        //     decision: record.get('decision'),
-        //     resource: record.get('resource'),
-        //     moderator: record.get('moderator'),
-        //     type: record.get('type'),
-        //   }))
-        // })
         const mutateDecisionWriteTxResultPromise = session.writeTransaction(async txc => {
           const mutateDecisionTransactionResponse = await txc.run(cypher, {
             resourceId,
@@ -229,7 +105,4 @@ export default {
       return createdRelationshipWithNestedAttributes
     },
   },
-  REVIEWED: {
-    // Wolle ...undefinedToNullResolver(['uuid']),
-  },
 }
diff --git a/backend/src/schema/resolvers/moderation.spec.js b/backend/src/schema/resolvers/moderation.spec.js
index 24d2ff280..f80371c16 100644
--- a/backend/src/schema/resolvers/moderation.spec.js
+++ b/backend/src/schema/resolvers/moderation.spec.js
@@ -153,7 +153,6 @@ describe('moderate resources', () => {
 
         describe('moderate a comment', () => {
           beforeEach(async () => {
-            // Wolle variables = {}
             await factory.create('Comment', {
               id: 'comment-id',
             })
diff --git a/backend/src/schema/resolvers/reports.js b/backend/src/schema/resolvers/reports.js
index b05d82b9d..aa6fc663e 100644
--- a/backend/src/schema/resolvers/reports.js
+++ b/backend/src/schema/resolvers/reports.js
@@ -1,5 +1,3 @@
-// Wolle import { undefinedToNullResolver } from './helpers/Resolver'
-
 export default {
   Mutation: {
     report: async (_parent, params, context, _resolveInfo) => {
@@ -16,7 +14,7 @@ export default {
             // no open claim, create one
             MERGE (resource)<-[:BELONGS_TO]-(claim:Claim {closed: false})
             ON CREATE SET claim.id = randomUUID(), claim.createdAt = $createdAt, claim.updatedAt = claim.createdAt, claim.rule = 'latestReviewUpdatedAtRules', claim.disable = false, claim.closed = false
-            // Create report on claim
+            // Create report to claim
             WITH submitter, resource, claim
             CREATE (claim)<-[report:REPORTED {createdAt: $createdAt, reasonCategory: $reasonCategory, reasonDescription: $reasonDescription}]-(submitter)
 
@@ -90,7 +88,6 @@ export default {
       try {
         const cypher = `
           MATCH (submitter:User)-[report:REPORTED]->(claim:Claim)-[:BELONGS_TO]->(resource)
-          // Wolle OPTIONAL MATCH (reviewer:User)-[:REVIEWED]->(claim)
           WHERE resource:User OR resource:Post OR resource:Comment
           RETURN submitter, report, claim, resource, labels(resource)[0] as type
           ${orderByClause}
@@ -141,19 +138,7 @@ export default {
         session.close()
       }
 
-      // Wolle console.log('response: ')
-      // response.forEach((ele, index) => {
-      //   // console.log('ele #', index, ': ', ele)
-      //   // if (ele.decision === undefined)
-      //   // console.log('ele #', index, ': ', ele)
-      //   if (ele.decision) console.log('ele #', index, ': ', ele)
-      // })
-      // // Wolle console.log('response: ', response)
-
       return response
     },
   },
-  REPORTED: {
-    // Wolle ...undefinedToNullResolver(['claimId', 'claimDisable', 'claimUpdatedAt', 'claimClosed']),
-  },
 }
diff --git a/backend/src/schema/types/type/REVIEWED.gql b/backend/src/schema/types/type/REVIEWED.gql
index ce8aebf3d..9546bfaf2 100644
--- a/backend/src/schema/types/type/REVIEWED.gql
+++ b/backend/src/schema/types/type/REVIEWED.gql
@@ -12,12 +12,7 @@ type REVIEWED {
   claimClosed: Boolean!
   
   moderator: User
-    # Wolle @cypher(statement: "MATCH (resource)<-[:DECIDED]-(moderator:User) RETURN moderator")
-  # not yet supported
-  # Wolle resource: ReportResource
-  #   @cypher(statement: "MATCH (resource)<-[:DECIDED]-(:User) RETURN resource")
   type: String
-    # @cypher(statement: "MATCH (resource)<-[:DECIDED]-(user:User) RETURN labels(resource)[0]")
   user: User
   post: Post
   comment: Comment

From 7de34d3d5519059d2bdeb9be657ef4b37247aa5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Fri, 22 Nov 2019 15:44:50 +0100
Subject: [PATCH 057/174] Fix tests by first report before review

---
 .../softDelete/softDeleteMiddleware.spec.js   | 21 +++++++++
 .../src/schema/resolvers/moderation.spec.js   | 43 +++++++++++++++++++
 .../schema/resolvers/user_management.spec.js  | 18 ++++++++
 3 files changed, 82 insertions(+)

diff --git a/backend/src/middleware/softDelete/softDeleteMiddleware.spec.js b/backend/src/middleware/softDelete/softDeleteMiddleware.spec.js
index d5a4565fc..1baaa7487 100644
--- a/backend/src/middleware/softDelete/softDeleteMiddleware.spec.js
+++ b/backend/src/middleware/softDelete/softDeleteMiddleware.spec.js
@@ -111,6 +111,27 @@ beforeAll(async () => {
   mutate = client.mutate
 
   authenticatedUser = await moderator.toJson()
+  const reportMutation = gql `
+    mutation($resourceId: ID!, $reasonCategory: ReasonCategory!, $reasonDescription: String!) {
+      report(
+        resourceId: $resourceId
+        reasonCategory: $reasonCategory
+        reasonDescription: $reasonDescription
+      ) {
+        type
+      }
+    }
+  `
+  const reportVariables = {
+    resourceId: 'undefined-resource',
+    reasonCategory: 'discrimination_etc',
+    reasonDescription: 'I am what I am !!!',
+  }
+  await Promise.all([
+    mutate({ mutation: reportMutation, variables: { ...reportVariables, resourceId: 'c1' } }),
+    mutate({ mutation: reportMutation, variables: { ...reportVariables, resourceId: 'u2' } }),
+    mutate({ mutation: reportMutation, variables: { ...reportVariables, resourceId: 'p2' } }),
+  ])
   const reviewMutation = gql`
     mutation($resourceId: ID!, $disable: Boolean, $closed: Boolean) {
       review(resourceId: $resourceId, disable: $disable, closed: $closed) {
diff --git a/backend/src/schema/resolvers/moderation.spec.js b/backend/src/schema/resolvers/moderation.spec.js
index f80371c16..6e6fa856f 100644
--- a/backend/src/schema/resolvers/moderation.spec.js
+++ b/backend/src/schema/resolvers/moderation.spec.js
@@ -17,6 +17,17 @@ let query,
   moderator,
   nonModerator
 
+const reportMutation = gql `
+  mutation($resourceId: ID!, $reasonCategory: ReasonCategory!, $reasonDescription: String!) {
+    report(
+      resourceId: $resourceId
+      reasonCategory: $reasonCategory
+      reasonDescription: $reasonDescription
+    ) {
+      type
+    }
+  }
+`
 const reviewMutation = gql`
   mutation($resourceId: ID!, $disable: Boolean, $closed: Boolean) {
     review(resourceId: $resourceId, disable: $disable, closed: $closed) {
@@ -156,6 +167,14 @@ describe('moderate resources', () => {
             await factory.create('Comment', {
               id: 'comment-id',
             })
+            await mutate({
+              mutation: reportMutation,
+              variables: {
+                resourceId: 'comment-id',
+                reasonCategory: 'discrimination_etc',
+                reasonDescription: 'I am what I am !!!',
+              },
+            })
           })
 
           it('returns disabled resource id', async () => {
@@ -228,6 +247,14 @@ describe('moderate resources', () => {
             await factory.create('Post', {
               id: 'sample-post-id',
             })
+            await mutate({
+              mutation: reportMutation,
+              variables: {
+                resourceId: 'sample-post-id',
+                reasonCategory: 'discrimination_etc',
+                reasonDescription: 'I am what I am !!!',
+              },
+            })
           })
 
           it('returns disabled resource id', async () => {
@@ -377,6 +404,14 @@ describe('moderate resources', () => {
             await factory.create('Comment', {
               id: 'comment-id',
             })
+            await mutate({
+              mutation: reportMutation,
+              variables: {
+                resourceId: 'comment-id',
+                reasonCategory: 'discrimination_etc',
+                reasonDescription: 'I am what I am !!!',
+              },
+            })
             await mutate({ mutation: reviewMutation, variables: disableVariables })
           })
 
@@ -435,6 +470,14 @@ describe('moderate resources', () => {
             await factory.create('Post', {
               id: 'post-id',
             })
+            await mutate({
+              mutation: reportMutation,
+              variables: {
+                resourceId: 'post-id',
+                reasonCategory: 'discrimination_etc',
+                reasonDescription: 'I am what I am !!!',
+              },
+            })
             await mutate({ mutation: reviewMutation, variables: disableVariables })
           })
 
diff --git a/backend/src/schema/resolvers/user_management.spec.js b/backend/src/schema/resolvers/user_management.spec.js
index 8b12b4939..f3976c183 100644
--- a/backend/src/schema/resolvers/user_management.spec.js
+++ b/backend/src/schema/resolvers/user_management.spec.js
@@ -17,6 +17,24 @@ const disable = async id => {
   await factory.create('User', { id: 'u2', role: 'moderator' })
   const moderatorBearerToken = encode({ id: 'u2' })
   req = { headers: { authorization: `Bearer ${moderatorBearerToken}` } }
+  await mutate({
+    mutation: gql `
+      mutation($resourceId: ID!, $reasonCategory: ReasonCategory!, $reasonDescription: String!) {
+        report(
+          resourceId: $resourceId
+          reasonCategory: $reasonCategory
+          reasonDescription: $reasonDescription
+        ) {
+          type
+        }
+      }
+    `,
+    variables: {
+      resourceId: id,
+      reasonCategory: 'discrimination_etc',
+      reasonDescription: 'I am what I am !!!',
+    },
+  })
   await mutate({
     mutation: gql`
       mutation($resourceId: ID!, $disable: Boolean, $closed: Boolean) {

From 0de778e743e1e36bc60e339850e81cfd5fddf853 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Fri, 22 Nov 2019 16:14:45 +0100
Subject: [PATCH 058/174] Correct mutations report and review to overtake the
 resource disabled

---
 backend/src/schema/resolvers/moderation.js | 2 +-
 backend/src/schema/resolvers/reports.js    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/src/schema/resolvers/moderation.js b/backend/src/schema/resolvers/moderation.js
index 84a360baf..b5416c686 100644
--- a/backend/src/schema/resolvers/moderation.js
+++ b/backend/src/schema/resolvers/moderation.js
@@ -22,7 +22,7 @@ export default {
 
             // no open claim, create one, update existing
             MERGE (resource)<-[:BELONGS_TO]-(claim:Claim {closed: false})
-            ON CREATE SET claim.id = randomUUID(), claim.createdAt = $dateTime, claim.updatedAt = claim.createdAt, claim.rule = 'latestReviewUpdatedAtRules', claim.disable = false, claim.closed = false
+            ON CREATE SET claim.id = randomUUID(), claim.createdAt = $dateTime, claim.updatedAt = claim.createdAt, claim.rule = 'latestReviewUpdatedAtRules', claim.disable = resource.disabled, claim.closed = false
             ON MATCH SET claim.updatedAt = $dateTime
             // claim.disable and claim.closed are set after setting them in review
 
diff --git a/backend/src/schema/resolvers/reports.js b/backend/src/schema/resolvers/reports.js
index aa6fc663e..34c0a9a0a 100644
--- a/backend/src/schema/resolvers/reports.js
+++ b/backend/src/schema/resolvers/reports.js
@@ -13,7 +13,7 @@ export default {
             WHERE resource:User OR resource:Post OR resource:Comment
             // no open claim, create one
             MERGE (resource)<-[:BELONGS_TO]-(claim:Claim {closed: false})
-            ON CREATE SET claim.id = randomUUID(), claim.createdAt = $createdAt, claim.updatedAt = claim.createdAt, claim.rule = 'latestReviewUpdatedAtRules', claim.disable = false, claim.closed = false
+            ON CREATE SET claim.id = randomUUID(), claim.createdAt = $createdAt, claim.updatedAt = claim.createdAt, claim.rule = 'latestReviewUpdatedAtRules', claim.disable = resource.disabled, claim.closed = false
             // Create report to claim
             WITH submitter, resource, claim
             CREATE (claim)<-[report:REPORTED {createdAt: $createdAt, reasonCategory: $reasonCategory, reasonDescription: $reasonDescription}]-(submitter)

From 0bf8bcf1c663dbe9e34f9ecc5ad41fed7095d266 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Fri, 22 Nov 2019 16:21:48 +0100
Subject: [PATCH 059/174] Change watch to apollo reports update

---
 webapp/pages/moderation/index.vue | 83 ++++++++++++++-----------------
 1 file changed, 38 insertions(+), 45 deletions(-)

diff --git a/webapp/pages/moderation/index.vue b/webapp/pages/moderation/index.vue
index 9478bd886..0efd2ee56 100644
--- a/webapp/pages/moderation/index.vue
+++ b/webapp/pages/moderation/index.vue
@@ -204,48 +204,6 @@ export default {
       }
     },
   },
-  watch: {
-    reports: {
-      immediate: true,
-      handler(newReports) {
-        // Wolle console.log('newReports: ', newReports)
-        const newReportedContentStructure = []
-        newReports.forEach(report => {
-          const resource =
-            report.type === 'User'
-              ? report.user
-              : report.type === 'Post'
-              ? report.post
-              : report.type === 'Comment'
-              ? report.comment
-              : undefined
-          let idx = newReportedContentStructure.findIndex(
-            content => content.resource.id === resource.id,
-          )
-          // if content not in content list, then add it
-          if (idx === -1) {
-            idx = newReportedContentStructure.length
-            newReportedContentStructure.push({
-              claimId: report.claimId,
-              claimUpdatedAt: report.claimUpdatedAt,
-              claimDisable: report.claimDisable,
-              claimClosed: report.claimClosed,
-              type: report.type,
-              resource,
-              user: report.user,
-              post: report.post,
-              comment: report.comment,
-              contentBelongsToUser: report.type === 'User' ? null : resource.author,
-              reports: [],
-            })
-          }
-          newReportedContentStructure[idx].reports.push(report)
-        })
-        // Wolle console.log('newReportedContentStructure: ', newReportedContentStructure)
-        this.reportedContentStructure = newReportedContentStructure
-      },
-    },
-  },
   methods: {
     confirm(content) {
       this.openModal(content)
@@ -315,9 +273,44 @@ export default {
       variables() {
         return {}
       },
-      // Wolle update({ Post }) {
-      //   this.setCurrentPosts(Post)
-      // },
+      update({ reports }) {
+        // Wolle console.log('reports: ', reports)
+        const newReportedContentStructure = []
+        reports.forEach(report => {
+          const resource =
+            report.type === 'User'
+              ? report.user
+              : report.type === 'Post'
+              ? report.post
+              : report.type === 'Comment'
+              ? report.comment
+              : undefined
+          let idx = newReportedContentStructure.findIndex(
+            content => content.resource.id === resource.id,
+          )
+          // if content not in content list, then add it
+          if (idx === -1) {
+            idx = newReportedContentStructure.length
+            newReportedContentStructure.push({
+              claimId: report.claimId,
+              claimUpdatedAt: report.claimUpdatedAt,
+              claimDisable: report.claimDisable,
+              claimClosed: report.claimClosed,
+              type: report.type,
+              resource,
+              user: report.user,
+              post: report.post,
+              comment: report.comment,
+              contentBelongsToUser: report.type === 'User' ? null : resource.author,
+              reports: [],
+            })
+          }
+          newReportedContentStructure[idx].reports.push(report)
+        })
+        // Wolle console.log('newReportedContentStructure: ', newReportedContentStructure)
+        this.reportedContentStructure = newReportedContentStructure
+        return reports
+      },
       fetchPolicy: 'cache-and-network',
     },
   },

From 99af6cbf8a66a90f5b4dddb73256bf297b783aea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Fri, 22 Nov 2019 18:40:51 +0100
Subject: [PATCH 060/174] Implement displaying multiple claims in the frontend

---
 .../softDelete/softDeleteMiddleware.spec.js   |   2 +-
 .../validation/validationMiddleware.js        |  13 +-
 backend/src/schema/resolvers/moderation.js    |   1 -
 .../src/schema/resolvers/moderation.spec.js   |   2 +-
 backend/src/schema/resolvers/reports.js       |   4 +-
 .../schema/resolvers/user_management.spec.js  |   2 +-
 webapp/locales/de.json                        |   3 +
 webapp/locales/en.json                        |   3 +
 webapp/pages/moderation/index.vue             | 153 +++++++++++-------
 9 files changed, 118 insertions(+), 65 deletions(-)

diff --git a/backend/src/middleware/softDelete/softDeleteMiddleware.spec.js b/backend/src/middleware/softDelete/softDeleteMiddleware.spec.js
index 1baaa7487..7102b88cc 100644
--- a/backend/src/middleware/softDelete/softDeleteMiddleware.spec.js
+++ b/backend/src/middleware/softDelete/softDeleteMiddleware.spec.js
@@ -111,7 +111,7 @@ beforeAll(async () => {
   mutate = client.mutate
 
   authenticatedUser = await moderator.toJson()
-  const reportMutation = gql `
+  const reportMutation = gql`
     mutation($resourceId: ID!, $reasonCategory: ReasonCategory!, $reasonDescription: String!) {
       report(
         resourceId: $resourceId
diff --git a/backend/src/middleware/validation/validationMiddleware.js b/backend/src/middleware/validation/validationMiddleware.js
index a50100d12..21890607b 100644
--- a/backend/src/middleware/validation/validationMiddleware.js
+++ b/backend/src/middleware/validation/validationMiddleware.js
@@ -112,9 +112,16 @@ const validateReview = async (resolve, root, args, context, info) => {
   })
 
   if (!existingReportedResource) throw new Error(`Resource not found!`)
-  if (!existingReportedResource.report) throw new Error(`Before you can start the reviewing process, please report the ${existingReportedResource.label}!`)
-  const authorId = existingReportedResource.label !== 'User' && existingReportedResource.author ? existingReportedResource.author.id : null
-  if (authorId && resourceId === authorId) throw new Error(`You cannot review your own ${existingReportedResource.label}!`)
+  if (!existingReportedResource.report)
+    throw new Error(
+      `Before you can start the reviewing process, please report the ${existingReportedResource.label}!`,
+    )
+  const authorId =
+    existingReportedResource.label !== 'User' && existingReportedResource.author
+      ? existingReportedResource.author.id
+      : null
+  if (authorId && resourceId === authorId)
+    throw new Error(`You cannot review your own ${existingReportedResource.label}!`)
   return resolve(root, args, context, info)
 }
 
diff --git a/backend/src/schema/resolvers/moderation.js b/backend/src/schema/resolvers/moderation.js
index b5416c686..1de06fa5f 100644
--- a/backend/src/schema/resolvers/moderation.js
+++ b/backend/src/schema/resolvers/moderation.js
@@ -81,7 +81,6 @@ export default {
           claimDisable: claim.properties.disable,
           claimClosed: claim.properties.closed,
           moderator: moderatorInResult.properties,
-          claimId: claim.id,
           type,
           post: null,
           comment: null,
diff --git a/backend/src/schema/resolvers/moderation.spec.js b/backend/src/schema/resolvers/moderation.spec.js
index 6e6fa856f..43e00d7fb 100644
--- a/backend/src/schema/resolvers/moderation.spec.js
+++ b/backend/src/schema/resolvers/moderation.spec.js
@@ -17,7 +17,7 @@ let query,
   moderator,
   nonModerator
 
-const reportMutation = gql `
+const reportMutation = gql`
   mutation($resourceId: ID!, $reasonCategory: ReasonCategory!, $reasonDescription: String!) {
     report(
       resourceId: $resourceId
diff --git a/backend/src/schema/resolvers/reports.js b/backend/src/schema/resolvers/reports.js
index 34c0a9a0a..13bd89cfc 100644
--- a/backend/src/schema/resolvers/reports.js
+++ b/backend/src/schema/resolvers/reports.js
@@ -77,10 +77,10 @@ export default {
       let orderByClause
       switch (params.orderBy) {
         case 'createdAt_asc':
-          orderByClause = 'ORDER BY report.createdAt ASC'
+          orderByClause = 'ORDER BY claim.createdAt ASC, report.createdAt ASC'
           break
         case 'createdAt_desc':
-          orderByClause = 'ORDER BY report.createdAt DESC'
+          orderByClause = 'ORDER BY claim.createdAt DESC, report.createdAt DESC'
           break
         default:
           orderByClause = ''
diff --git a/backend/src/schema/resolvers/user_management.spec.js b/backend/src/schema/resolvers/user_management.spec.js
index f3976c183..61dfe49cf 100644
--- a/backend/src/schema/resolvers/user_management.spec.js
+++ b/backend/src/schema/resolvers/user_management.spec.js
@@ -18,7 +18,7 @@ const disable = async id => {
   const moderatorBearerToken = encode({ id: 'u2' })
   req = { headers: { authorization: `Bearer ${moderatorBearerToken}` } }
   await mutate({
-    mutation: gql `
+    mutation: gql`
       mutation($resourceId: ID!, $reasonCategory: ReasonCategory!, $reasonDescription: String!) {
         report(
           resourceId: $resourceId
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index ae89820c8..ba0a4efad 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -493,6 +493,9 @@
       "DecisionSuccess": "Erfolgreich entschieden!",
       "enabledBy": "Entsperrt von",
       "disabledBy": "Gesperrt von",
+      "previousDecision": "Vorherige Entscheidung:",
+      "enabledAt": "Entsperrt am",
+      "disabledAt": "Gesperrt am",
       "reasonCategory": "Kategorie",
       "reasonDescription": "Beschreibung",
       "createdAt": "Datum",
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index c50aeb3bd..b082a5111 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -494,6 +494,9 @@
       "DecisionSuccess": "Decided successfully!",
       "enabledBy": "Enabled by",
       "disabledBy": "Disabled by",
+      "previousDecision": "Previous decision:",
+      "enabledAt": "Enabled at",
+      "disabledAt": "Disabled at",
       "reasonCategory": "Category",
       "reasonDescription": "Description",
       "createdAt": "Date",
diff --git a/webapp/pages/moderation/index.vue b/webapp/pages/moderation/index.vue
index 0efd2ee56..fc82027fe 100644
--- a/webapp/pages/moderation/index.vue
+++ b/webapp/pages/moderation/index.vue
@@ -2,16 +2,16 @@
   <ds-card space="small">
     <ds-heading tag="h3">{{ $t('moderation.reports.name') }}</ds-heading>
     <table
-      v-if="reportedContentStructure && reportedContentStructure.length"
+      v-if="resourcesClaims && resourcesClaims.length"
       class="ds-table ds-table-condensed ds-table-bordered"
       cellspacing="0"
       cellpadding="0"
     >
       <colgroup><col width="" /></colgroup>
-      <template v-for="content in reportedContentStructure">
+      <template v-for="content in resourcesClaims">
         <thead
           :class="[
-            content.claimClosed ? 'decision' : 'no-decision',
+            content.latestClaim.closed ? 'decision' : 'no-decision',
             'ds-table-col',
             'ds-table-head-col',
             'ds-table-head-col-border',
@@ -88,8 +88,8 @@
               <span v-else>—</span>
             </td>
             <td class="ds-table-col ds-table-head-col-border">
-              <!-- claimClosed -->
-              <b v-if="content.claimClosed">
+              <!-- latestClaim.closed -->
+              <b v-if="content.latestClaim.closed">
                 {{ $t('moderation.reports.decided') }}
               </b>
               <ds-button
@@ -104,7 +104,7 @@
               <!-- reviewedByModerator -->
               <div v-if="content.resource.reviewedByModerator">
                 <br />
-                <div v-if="content.claimDisable">
+                <div v-if="content.latestClaim.disable">
                   <ds-icon name="eye-slash" class="ban" />
                   {{ $t('moderation.reports.disabledBy') }}
                 </div>
@@ -116,7 +116,7 @@
                   :user="content.resource.reviewedByModerator"
                   :showAvatar="false"
                   :trunc="30"
-                  :date-time="content.claimUpdatedAt"
+                  :date-time="content.latestClaim.updatedAt"
                   positionDatetime="below"
                 />
               </div>
@@ -136,26 +136,51 @@
           <tr>
             <td class="ds-table-col ds-table-head-col-border"></td>
             <td class="ds-table-col ds-table-head-col-border" colspan="3">
-              <ds-table :data="content.reports" :fields="reportFields" condensed>
-                <!-- submitter -->
-                <template slot="submitter" slot-scope="scope">
-                  <hc-user
-                    :user="scope.row.submitter"
-                    :showAvatar="false"
-                    :trunc="30"
-                    :date-time="scope.row.createdAt"
-                    :positionDatetime="'below'"
-                  />
-                </template>
-                <!-- reasonCategory -->
-                <template slot="reasonCategory" slot-scope="scope">
-                  {{ $t('report.reason.category.options.' + scope.row.reasonCategory) }}
-                </template>
-                <!-- reasonDescription -->
-                <template slot="reasonDescription" slot-scope="scope">
-                  {{ scope.row.reasonDescription.length ? scope.row.reasonDescription : '—' }}
-                </template>
-              </ds-table>
+              <template v-for="(claim, indexClaim) in content.claims">
+                <div :key="claim.id">
+                  <div v-if="indexClaim > 0">
+                    <b>{{ $t('moderation.reports.previousDecision') }}</b>
+                    <div>
+                      <span v-if="claim.disable">
+                        <ds-icon name="eye-slash" class="ban" />
+                        {{ $t('moderation.reports.disabledAt') }}
+                      </span>
+                      <span v-else>
+                        <ds-icon name="eye" class="no-ban" />
+                        {{ $t('moderation.reports.enabledAt') }}
+                      </span>
+                      <ds-text size="small" color="soft">
+                        <ds-icon name="clock" />
+                        <client-only>
+                          <hc-relative-date-time :date-time="claim.updatedAt" />
+                        </client-only>
+                      </ds-text>
+                    </div>
+                    <ds-space margin-bottom="x-small" />
+                  </div>
+                  <ds-table :data="claim.reports" :fields="reportFields" condensed>
+                    <!-- submitter -->
+                    <template slot="submitter" slot-scope="scope">
+                      <hc-user
+                        :user="scope.row.submitter"
+                        :showAvatar="false"
+                        :trunc="30"
+                        :date-time="scope.row.createdAt"
+                        :positionDatetime="'below'"
+                      />
+                    </template>
+                    <!-- reasonCategory -->
+                    <template slot="reasonCategory" slot-scope="scope">
+                      {{ $t('report.reason.category.options.' + scope.row.reasonCategory) }}
+                    </template>
+                    <!-- reasonDescription -->
+                    <template slot="reasonDescription" slot-scope="scope">
+                      {{ scope.row.reasonDescription.length ? scope.row.reasonDescription : '—' }}
+                    </template>
+                  </ds-table>
+                  <ds-space margin-bottom="base" />
+                </div>
+              </template>
             </td>
           </tr>
         </tbody>
@@ -167,18 +192,20 @@
 
 <script>
 import HcEmpty from '~/components/Empty/Empty'
+import HcRelativeDateTime from '~/components/RelativeDateTime'
 import HcUser from '~/components/User/User'
 import { reportListQuery, reviewMutation } from '~/graphql/Moderation.js'
 
 export default {
   components: {
     HcEmpty,
+    HcRelativeDateTime,
     HcUser,
   },
   data() {
     return {
       reports: [],
-      reportedContentStructure: [],
+      resourcesClaims: [],
     }
   },
   computed: {
@@ -187,22 +214,20 @@ export default {
         submitter: this.$t('moderation.reports.submitter'),
         reasonCategory: this.$t('moderation.reports.reasonCategory'),
         reasonDescription: this.$t('moderation.reports.reasonDescription'),
-        // Wolle createdAt: this.$t('moderation.reports.createdAt'),
-      }
-    },
-    // Wolle delete + language
-    fields() {
-      return {
-        type: ' ',
-        reportedUserContent: ' ',
-        reasonCategory: this.$t('moderation.reports.reasonCategory'),
-        reasonDescription: this.$t('moderation.reports.reasonDescription'),
-        submitter: this.$t('moderation.reports.submitter'),
-        createdAt: this.$t('moderation.reports.createdAt'),
-        disabledBy: this.$t('moderation.reports.disabledBy'),
-        // actions: ' '
       }
     },
+    // Wolle delete + remove unneeded translations
+    // fields() {
+    //   return {
+    //     type: ' ',
+    //     reportedUserContent: ' ',
+    //     reasonCategory: this.$t('moderation.reports.reasonCategory'),
+    //     reasonDescription: this.$t('moderation.reports.reasonDescription'),
+    //     submitter: this.$t('moderation.reports.submitter'),
+    //     createdAt: this.$t('moderation.reports.createdAt'),
+    //     disabledBy: this.$t('moderation.reports.disabledBy'),
+    //   }
+    // },
   },
   methods: {
     confirm(content) {
@@ -225,7 +250,7 @@ export default {
         'moderation.reports.decideModal.' +
         content.type +
         '.' +
-        (content.claimDisable ? 'disable' : 'enable')
+        (content.latestClaim.disable ? 'disable' : 'enable')
       this.$store.commit('modal/SET_OPEN', {
         name: 'confirm',
         data: {
@@ -275,7 +300,7 @@ export default {
       },
       update({ reports }) {
         // Wolle console.log('reports: ', reports)
-        const newReportedContentStructure = []
+        const newResourcesClaims = []
         reports.forEach(report => {
           const resource =
             report.type === 'User'
@@ -285,30 +310,46 @@ export default {
               : report.type === 'Comment'
               ? report.comment
               : undefined
-          let idx = newReportedContentStructure.findIndex(
+          let idxResource = newResourcesClaims.findIndex(
             content => content.resource.id === resource.id,
           )
-          // if content not in content list, then add it
-          if (idx === -1) {
-            idx = newReportedContentStructure.length
-            newReportedContentStructure.push({
-              claimId: report.claimId,
-              claimUpdatedAt: report.claimUpdatedAt,
-              claimDisable: report.claimDisable,
-              claimClosed: report.claimClosed,
+          // if resource not in resource list, then add it
+          if (idxResource === -1) {
+            idxResource = newResourcesClaims.length
+            newResourcesClaims.push({
+              latestClaim: {
+                id: report.claimId,
+                updatedAt: report.claimUpdatedAt,
+                disable: report.claimDisable,
+                closed: report.claimClosed,
+              },
               type: report.type,
               resource,
               user: report.user,
               post: report.post,
               comment: report.comment,
               contentBelongsToUser: report.type === 'User' ? null : resource.author,
+              claims: [],
+            })
+          }
+          let idxClaim = newResourcesClaims[idxResource].claims.findIndex(
+            claim => claim.id === report.claimId,
+          )
+          // if claim not in claim list, then add it
+          if (idxClaim === -1) {
+            idxClaim = newResourcesClaims[idxResource].claims.length
+            newResourcesClaims[idxResource].claims.push({
+              id: report.claimId,
+              updatedAt: report.claimUpdatedAt,
+              disable: report.claimDisable,
+              closed: report.claimClosed,
               reports: [],
             })
           }
-          newReportedContentStructure[idx].reports.push(report)
+          newResourcesClaims[idxResource].claims[idxClaim].reports.push(report)
         })
-        // Wolle console.log('newReportedContentStructure: ', newReportedContentStructure)
-        this.reportedContentStructure = newReportedContentStructure
+        // Wolle console.log('newResourcesClaims: ', newResourcesClaims)
+        this.resourcesClaims = newResourcesClaims
         return reports
       },
       fetchPolicy: 'cache-and-network',

From d5afb6c7900a74eb162fc69eafadcb610ccebb24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Fri, 22 Nov 2019 19:31:19 +0100
Subject: [PATCH 061/174] Add old script again as template

---
 .../change_report_node_to_relationship.sh     | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 neo4j/storeOldScriptsAsTemplates/change_report_node_to_relationship.sh

diff --git a/neo4j/storeOldScriptsAsTemplates/change_report_node_to_relationship.sh b/neo4j/storeOldScriptsAsTemplates/change_report_node_to_relationship.sh
new file mode 100644
index 000000000..8fb2ad4db
--- /dev/null
+++ b/neo4j/storeOldScriptsAsTemplates/change_report_node_to_relationship.sh
@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+
+ENV_FILE=$(dirname "$0")/.env
+[[ -f "$ENV_FILE" ]] && source "$ENV_FILE"
+
+if [ -z "$NEO4J_USERNAME" ] || [ -z "$NEO4J_PASSWORD" ]; then
+  echo "Please set NEO4J_USERNAME and NEO4J_PASSWORD environment variables."
+  echo "Database manipulation is not possible without connecting to the database."
+  echo "E.g. you could \`cp .env.template .env\` unless you run the script in a docker container"
+fi
+
+until echo 'RETURN "Connection successful" as info;' | cypher-shell
+do
+  echo "Connecting to neo4j failed, trying again..."
+  sleep 1
+done
+
+echo "
+MATCH (submitter:User)-[:REPORTED]->(report:Report)-[:REPORTED]->(resource)
+DETACH DELETE report
+CREATE (submitter)-[reported:REPORTED]->(resource)
+SET reported.createdAt = toString(datetime())
+SET reported.reasonCategory = 'other'
+SET reported.reasonDescription = '!!! Created automatically to ensure database consistency! Creation date is when the database manipulation happened.'
+RETURN reported;
+" | cypher-shell
\ No newline at end of file

From b2db3118f21d05889aed1d83b0db38096623b9ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Fri, 22 Nov 2019 19:32:13 +0100
Subject: [PATCH 062/174] Add dubios vanished code again

---
 backend/src/schema/types/type/Comment.gql | 51 +++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/backend/src/schema/types/type/Comment.gql b/backend/src/schema/types/type/Comment.gql
index 1f0404975..b14c9c600 100644
--- a/backend/src/schema/types/type/Comment.gql
+++ b/backend/src/schema/types/type/Comment.gql
@@ -1,3 +1,41 @@
+enum _CommentOrdering {
+  id_asc
+  id_desc
+  content_asc
+  content_desc
+  createdAt_asc
+  createdAt_desc
+  updatedAt_asc
+  updatedAt_desc
+}
+
+input _CommentFilter {
+  AND: [_CommentFilter!]
+  OR: [_CommentFilter!]
+  id: ID
+  id_not: ID
+  id_in: [ID!]
+  id_not_in: [ID!]
+  author: _UserFilter
+  author_not: _UserFilter
+  author_in: [_UserFilter!]
+  author_not_in: [_UserFilter!]
+  content: String
+  content_not: String
+  content_in: [String!]
+  content_not_in: [String!]
+  content_contains: String
+  content_not_contains: String
+  content_starts_with: String
+  content_not_starts_with: String
+  content_ends_with: String
+  content_not_ends_with: String
+  post: _PostFilter
+  post_not: _PostFilter
+  post_in: [_PostFilter!]
+  post_not_in: [_PostFilter!]
+}
+
 type Comment {
   id: ID!
   activityId: String
@@ -20,6 +58,19 @@ type Comment {
     )
 }
 
+type Query {
+  Comment(
+    id: ID
+    content: String
+    createdAt: String
+    updatedAt: String
+    first: Int
+    offset: Int
+    orderBy: [_CommentOrdering]
+    filter: _CommentFilter
+  ): [Comment]
+}
+
 type Mutation {
   CreateComment(
     id: ID

From 8cc05ab910f4c130310a15cd3588eb40e6787766 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Sat, 23 Nov 2019 08:42:44 +0100
Subject: [PATCH 063/174] More complex report and review seeding

---
 backend/src/seed/seed-db.js | 109 +++++++++++++++++++++++++++++++++++-
 1 file changed, 107 insertions(+), 2 deletions(-)

diff --git a/backend/src/seed/seed-db.js b/backend/src/seed/seed-db.js
index 990b749c3..cf29389d4 100644
--- a/backend/src/seed/seed-db.js
+++ b/backend/src/seed/seed-db.js
@@ -657,6 +657,7 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
       }
     `
     authenticatedUser = await huey.toJson()
+    // report resource first time
     await Promise.all([
       mutate({
         mutation: reportMutation,
@@ -690,6 +691,14 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
           reasonDescription: 'This post is bigoted',
         },
       }),
+      mutate({
+        mutation: reportMutation,
+        variables: {
+          resourceId: 'p2',
+          reasonCategory: 'doxing',
+          reasonDescription: 'OMG my data !!!',
+        },
+      }),
       mutate({
         mutation: reportMutation,
         variables: {
@@ -699,7 +708,7 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
         },
       }),
     ])
-    // report content a second time
+    // report resource a second time
     authenticatedUser = await dewey.toJson()
     await Promise.all([
       mutate({
@@ -726,6 +735,14 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
           reasonDescription: '',
         },
       }),
+      mutate({
+        mutation: reportMutation,
+        variables: {
+          resourceId: 'p2',
+          reasonCategory: 'intentional_intimidation_stalking_persecution',
+          reasonDescription: '',
+        },
+      }),
       mutate({
         mutation: reportMutation,
         variables: {
@@ -737,7 +754,7 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
     ])
     authenticatedUser = null
 
-    // only review after report !!!
+    // only review resource after report !!!
     const reviewMutation = gql`
       mutation($resourceId: ID!, $disable: Boolean, $closed: Boolean) {
         review(resourceId: $resourceId, disable: $disable, closed: $closed) {
@@ -750,8 +767,16 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
       disable: true,
       closed: false,
     }
+    // review resource first time
     authenticatedUser = await bobDerBaumeister.toJson()
     await Promise.all([
+      mutate({
+        mutation: reviewMutation,
+        variables: {
+          ...disableVariables,
+          resourceId: 'p2',
+        },
+      }),
       mutate({
         mutation: reviewMutation,
         variables: {
@@ -768,6 +793,86 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
         },
       }),
     ])
+    // second review of resource and close claim
+    authenticatedUser = await peterLustig.toJson()
+    await Promise.all([
+      mutate({
+        mutation: reviewMutation,
+        variables: {
+          ...disableVariables,
+          resourceId: 'p2',
+          disable: false,
+          closed: true,
+        },
+      }),
+    ])
+    authenticatedUser = null
+
+    // report resource after closing of the claim
+    authenticatedUser = await bobDerBaumeister.toJson()
+    await Promise.all([
+      mutate({
+        mutation: reportMutation,
+        variables: {
+          resourceId: 'p2',
+          reasonCategory: 'doxing',
+          reasonDescription: "That's my friends privat data!",
+        },
+      }),
+    ])
+    // report resource second time after closing of the claim
+    authenticatedUser = await jennyRostock.toJson()
+    await Promise.all([
+      mutate({
+        mutation: reportMutation,
+        variables: {
+          resourceId: 'p2',
+          reasonCategory: 'doxing',
+          reasonDescription: "I think it is my friends data!",
+        },
+      }),
+    ])
+    authenticatedUser = null
+
+    // third review of resource and close claim
+    authenticatedUser = await bobDerBaumeister.toJson()
+    await Promise.all([
+      mutate({
+        mutation: reviewMutation,
+        variables: {
+          ...disableVariables,
+          resourceId: 'p2',
+          disable: true,
+          closed: true,
+        },
+      }),
+    ])
+    authenticatedUser = null
+
+    // report resource after second closing of the claim
+    authenticatedUser = await huey.toJson()
+    await Promise.all([
+      mutate({
+        mutation: reportMutation,
+        variables: {
+          resourceId: 'p2',
+          reasonCategory: 'doxing',
+          reasonDescription: "That's my privat data!",
+        },
+      }),
+    ])
+    // report resource second time after second closing of the claim
+    authenticatedUser = await jennyRostock.toJson()
+    await Promise.all([
+      mutate({
+        mutation: reportMutation,
+        variables: {
+          resourceId: 'p2',
+          reasonCategory: 'doxing',
+          reasonDescription: "I think it is my friends data again!",
+        },
+      }),
+    ])
     authenticatedUser = null
 
     await Promise.all(

From c757386f2638794f22758f9480779898cb16a5ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Sat, 23 Nov 2019 08:59:04 +0100
Subject: [PATCH 064/174] Better layout

---
 webapp/pages/moderation/index.vue | 41 ++++++++++++++++++-------------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/webapp/pages/moderation/index.vue b/webapp/pages/moderation/index.vue
index fc82027fe..a1442e9ce 100644
--- a/webapp/pages/moderation/index.vue
+++ b/webapp/pages/moderation/index.vue
@@ -138,24 +138,31 @@
             <td class="ds-table-col ds-table-head-col-border" colspan="3">
               <template v-for="(claim, indexClaim) in content.claims">
                 <div :key="claim.id">
+                  <!-- previousDecision -->
                   <div v-if="indexClaim > 0">
-                    <b>{{ $t('moderation.reports.previousDecision') }}</b>
-                    <div>
-                      <span v-if="claim.disable">
-                        <ds-icon name="eye-slash" class="ban" />
-                        {{ $t('moderation.reports.disabledAt') }}
-                      </span>
-                      <span v-else>
-                        <ds-icon name="eye" class="no-ban" />
-                        {{ $t('moderation.reports.enabledAt') }}
-                      </span>
-                      <ds-text size="small" color="soft">
-                        <ds-icon name="clock" />
-                        <client-only>
-                          <hc-relative-date-time :date-time="claim.updatedAt" />
-                        </client-only>
-                      </ds-text>
-                    </div>
+                    <ds-flex gutter="small">
+                      <ds-flex-item width="25%">
+                       <b>{{ $t('moderation.reports.previousDecision') }}</b>
+                      </ds-flex-item>
+                      <ds-flex-item>
+                        <div>
+                          <span v-if="claim.disable">
+                            <ds-icon name="eye-slash" class="ban" />
+                            {{ $t('moderation.reports.disabledAt') }}
+                          </span>
+                          <span v-else>
+                            <ds-icon name="eye" class="no-ban" />
+                            {{ $t('moderation.reports.enabledAt') }}
+                          </span>
+                          <ds-text size="small" color="soft">
+                            <ds-icon name="clock" />
+                            <client-only>
+                              <hc-relative-date-time :date-time="claim.updatedAt" />
+                            </client-only>
+                          </ds-text>
+                        </div>
+                      </ds-flex-item>
+                    </ds-flex>
                     <ds-space margin-bottom="x-small" />
                   </div>
                   <ds-table :data="claim.reports" :fields="reportFields" condensed>

From 70d8830e4c1a952a7ba5c85b5ca298141108518f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Sat, 23 Nov 2019 09:32:29 +0100
Subject: [PATCH 065/174] Add comment to Cypher of report mutation

---
 backend/src/schema/resolvers/reports.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/backend/src/schema/resolvers/reports.js b/backend/src/schema/resolvers/reports.js
index 13bd89cfc..b5632f241 100644
--- a/backend/src/schema/resolvers/reports.js
+++ b/backend/src/schema/resolvers/reports.js
@@ -14,6 +14,7 @@ export default {
             // no open claim, create one
             MERGE (resource)<-[:BELONGS_TO]-(claim:Claim {closed: false})
             ON CREATE SET claim.id = randomUUID(), claim.createdAt = $createdAt, claim.updatedAt = claim.createdAt, claim.rule = 'latestReviewUpdatedAtRules', claim.disable = resource.disabled, claim.closed = false
+            // ON MATCH: do not update claim.updatedAt !!! that is only for reviews!
             // Create report to claim
             WITH submitter, resource, claim
             CREATE (claim)<-[report:REPORTED {createdAt: $createdAt, reasonCategory: $reasonCategory, reasonDescription: $reasonDescription}]-(submitter)
@@ -77,7 +78,7 @@ export default {
       let orderByClause
       switch (params.orderBy) {
         case 'createdAt_asc':
-          orderByClause = 'ORDER BY claim.createdAt ASC, report.createdAt ASC'
+          orderByClause = 'ORDER BY claim.createdAt ASC, report.createdAt DESC'
           break
         case 'createdAt_desc':
           orderByClause = 'ORDER BY claim.createdAt DESC, report.createdAt DESC'

From 6890ef25be7e0e3daf5e08d7a46c4cae39a4b77c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Sat, 23 Nov 2019 09:34:03 +0100
Subject: [PATCH 066/174] Add sorting to resource claims and reports lists

---
 backend/src/schema/resolvers/moderation.js |  1 +
 backend/src/schema/resolvers/reports.js    |  2 +
 backend/src/schema/types/type/REPORTED.gql |  3 +-
 backend/src/schema/types/type/REVIEWED.gql |  3 +-
 webapp/graphql/Moderation.js               | 10 ++++
 webapp/pages/moderation/index.vue          | 58 ++++++++++++++--------
 6 files changed, 53 insertions(+), 24 deletions(-)

diff --git a/backend/src/schema/resolvers/moderation.js b/backend/src/schema/resolvers/moderation.js
index 1de06fa5f..58df850a4 100644
--- a/backend/src/schema/resolvers/moderation.js
+++ b/backend/src/schema/resolvers/moderation.js
@@ -77,6 +77,7 @@ export default {
         createdRelationshipWithNestedAttributes = {
           ...review.properties,
           claimId: claim.properties.id,
+          claimCreatedAt: claim.properties.createdAt,
           claimUpdatedAt: claim.properties.updatedAt,
           claimDisable: claim.properties.disable,
           claimClosed: claim.properties.closed,
diff --git a/backend/src/schema/resolvers/reports.js b/backend/src/schema/resolvers/reports.js
index b5632f241..ca5a1ced3 100644
--- a/backend/src/schema/resolvers/reports.js
+++ b/backend/src/schema/resolvers/reports.js
@@ -44,6 +44,7 @@ export default {
         createdRelationshipWithNestedAttributes = {
           ...report.properties,
           claimId: claim.properties.id,
+          claimCreatedAt: claim.properties.createdAt,
           claimUpdatedAt: claim.properties.updatedAt,
           claimDisable: claim.properties.disable,
           claimClosed: claim.properties.closed,
@@ -112,6 +113,7 @@ export default {
           const responseEle = {
             ...report.properties,
             claimId: claim.properties.id,
+            claimCreatedAt: claim.properties.createdAt,
             claimUpdatedAt: claim.properties.updatedAt,
             claimDisable: claim.properties.disable,
             claimClosed: claim.properties.closed,
diff --git a/backend/src/schema/types/type/REPORTED.gql b/backend/src/schema/types/type/REPORTED.gql
index c05df094d..d59b720c2 100644
--- a/backend/src/schema/types/type/REPORTED.gql
+++ b/backend/src/schema/types/type/REPORTED.gql
@@ -4,8 +4,9 @@ type REPORTED {
   reasonDescription: String!
 
   claimId: ID!
-  claimDisable: Boolean!
+  claimCreatedAt: String!
   claimUpdatedAt: String!
+  claimDisable: Boolean!
   claimClosed: Boolean!
 
   submitter: User
diff --git a/backend/src/schema/types/type/REVIEWED.gql b/backend/src/schema/types/type/REVIEWED.gql
index 9546bfaf2..3babae152 100644
--- a/backend/src/schema/types/type/REVIEWED.gql
+++ b/backend/src/schema/types/type/REVIEWED.gql
@@ -7,8 +7,9 @@ type REVIEWED {
   closed: Boolean!
 
   claimId: ID!
-  claimDisable: Boolean!
+  claimCreatedAt: String!
   claimUpdatedAt: String!
+  claimDisable: Boolean!
   claimClosed: Boolean!
   
   moderator: User
diff --git a/webapp/graphql/Moderation.js b/webapp/graphql/Moderation.js
index 3300f2915..9ade5c414 100644
--- a/webapp/graphql/Moderation.js
+++ b/webapp/graphql/Moderation.js
@@ -9,6 +9,7 @@ export const reportListQuery = () => {
         reasonCategory
         reasonDescription
         claimId
+        claimCreatedAt
         claimUpdatedAt
         claimDisable
         claimClosed
@@ -35,6 +36,9 @@ export const reportListQuery = () => {
             name
             disabled
             deleted
+            followedByCount
+            contributionsCount
+            commentedCount
           }
           followedByCount
           contributionsCount
@@ -66,6 +70,9 @@ export const reportListQuery = () => {
             name
             disabled
             deleted
+            followedByCount
+            contributionsCount
+            commentedCount
           }
         }
         post {
@@ -90,6 +97,9 @@ export const reportListQuery = () => {
             name
             disabled
             deleted
+            followedByCount
+            contributionsCount
+            commentedCount
           }
         }
       }
diff --git a/webapp/pages/moderation/index.vue b/webapp/pages/moderation/index.vue
index a1442e9ce..42177164b 100644
--- a/webapp/pages/moderation/index.vue
+++ b/webapp/pages/moderation/index.vue
@@ -223,18 +223,6 @@ export default {
         reasonDescription: this.$t('moderation.reports.reasonDescription'),
       }
     },
-    // Wolle delete + remove unneeded translations
-    // fields() {
-    //   return {
-    //     type: ' ',
-    //     reportedUserContent: ' ',
-    //     reasonCategory: this.$t('moderation.reports.reasonCategory'),
-    //     reasonDescription: this.$t('moderation.reports.reasonDescription'),
-    //     submitter: this.$t('moderation.reports.submitter'),
-    //     createdAt: this.$t('moderation.reports.createdAt'),
-    //     disabledBy: this.$t('moderation.reports.disabledBy'),
-    //   }
-    // },
   },
   methods: {
     confirm(content) {
@@ -306,8 +294,8 @@ export default {
         return {}
       },
       update({ reports }) {
-        // Wolle console.log('reports: ', reports)
         const newResourcesClaims = []
+
         reports.forEach(report => {
           const resource =
             report.type === 'User'
@@ -320,16 +308,10 @@ export default {
           let idxResource = newResourcesClaims.findIndex(
             content => content.resource.id === resource.id,
           )
-          // if resource not in resource list, then add it
+          // if resource is not in resource list, then add it
           if (idxResource === -1) {
             idxResource = newResourcesClaims.length
             newResourcesClaims.push({
-              latestClaim: {
-                id: report.claimId,
-                updatedAt: report.claimUpdatedAt,
-                disable: report.claimDisable,
-                closed: report.claimClosed,
-              },
               type: report.type,
               resource,
               user: report.user,
@@ -342,11 +324,13 @@ export default {
           let idxClaim = newResourcesClaims[idxResource].claims.findIndex(
             claim => claim.id === report.claimId,
           )
-          // if claim not in claim list, then add it
+          // if claim is not in claim list, then add it
           if (idxClaim === -1) {
             idxClaim = newResourcesClaims[idxResource].claims.length
             newResourcesClaims[idxResource].claims.push({
+              // it is the same for all reports of a claim
               id: report.claimId,
+              createdAt: report.claimCreatedAt,
               updatedAt: report.claimUpdatedAt,
               disable: report.claimDisable,
               closed: report.claimClosed,
@@ -355,7 +339,37 @@ export default {
           }
           newResourcesClaims[idxResource].claims[idxClaim].reports.push(report)
         })
-        // Wolle console.log('newResourcesClaims: ', newResourcesClaims)
+
+        // sorting of resource claims and their reports
+        newResourcesClaims.forEach(resourceClaims => {
+          // latestClaim by updatedAt rules
+          resourceClaims.claims.sort(
+            (a, b) => new Date(b.updatedAt) - new Date(a.updatedAt),
+          )
+          resourceClaims.latestClaim = {
+            id: resourceClaims.claims[0].id,
+            createdAt: resourceClaims.claims[0].createdAt,
+            updatedAt: resourceClaims.claims[0].updatedAt,
+            disable: resourceClaims.claims[0].disable,
+            closed: resourceClaims.claims[0].closed,
+          }
+          // display claims always by starting with latest createdAt
+          resourceClaims.claims.sort(
+            (a, b) => new Date(b.createdAt) - new Date(a.createdAt),
+          )
+
+          resourceClaims.claims.forEach(claim => {
+            // display reports always by starting with latest createdAt
+            claim.reports.sort(
+              (a, b) => new Date(b.createdAt) - new Date(a.createdAt),
+            )
+          })
+        })
+        // display resources by starting with claims by their latest createdAt
+        newResourcesClaims.sort(
+          (a, b) => new Date(b.claims[0].createdAt) - new Date(a.claims[0].createdAt),
+        )
+        
         this.resourcesClaims = newResourcesClaims
         return reports
       },

From 2f07d528e43179e5e1fce63e3669f7a422913560 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Sat, 23 Nov 2019 10:49:34 +0100
Subject: [PATCH 067/174] View status icon under type icon

---
 webapp/pages/moderation/index.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/webapp/pages/moderation/index.vue b/webapp/pages/moderation/index.vue
index 42177164b..eecf2104b 100644
--- a/webapp/pages/moderation/index.vue
+++ b/webapp/pages/moderation/index.vue
@@ -53,6 +53,8 @@
                   v-tooltip="{ content: $t('report.user.type'), placement: 'right' }"
                   name="user"
                 />
+                <ds-icon v-if="content.resource.disabled" name="eye-slash" class="ban" />
+                <ds-icon v-else name="eye" class="no-ban" />
               </ds-text>
             </td>
             <td class="ds-table-col ds-table-head-col-border">

From 67a5a00704a6fd6a6c9ccb7bc75d01ab99e488dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Sat, 23 Nov 2019 10:58:16 +0100
Subject: [PATCH 068/174] Clean up

---
 backend/src/schema/resolvers/moderation.js | 9 ---------
 webapp/locales/de.json                     | 4 +---
 webapp/locales/en.json                     | 2 --
 3 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/backend/src/schema/resolvers/moderation.js b/backend/src/schema/resolvers/moderation.js
index 58df850a4..bcb38d9eb 100644
--- a/backend/src/schema/resolvers/moderation.js
+++ b/backend/src/schema/resolvers/moderation.js
@@ -3,12 +3,8 @@ export default {
     review: async (_object, params, context, _resolveInfo) => {
       const { resourceId } = params
       let { disable, closed } = params
-      // Wolle console.log('disable: ', disable)
-      // console.log('closed: ', closed)
       disable = disable === undefined ? null : disable
       closed = closed === undefined ? null : closed
-      // Wolle console.log('disable: ', disable)
-      // console.log('closed: ', closed)
       const { user: moderator, driver } = context
 
       let createdRelationshipWithNestedAttributes = null // return value
@@ -69,11 +65,6 @@ export default {
         const txResult = await mutateDecisionWriteTxResultPromise
         if (!txResult[0]) return null
         const { moderator: moderatorInResult, review, claim, resource, type } = txResult[0]
-        // Wolle console.log('review.properties.disable: ', review.properties.disable)
-        // console.log('claim.properties.disable: ', claim.properties.disable)
-        // console.log('resource.properties.disabled: ', resource.properties.disabled)
-        // console.log('review.properties.closed: ', review.properties.closed)
-        // console.log('claim.properties.closed: ', claim.properties.closed)
         createdRelationshipWithNestedAttributes = {
           ...review.properties,
           claimId: claim.properties.id,
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index bb2784d46..fdaeff5e1 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -333,7 +333,6 @@
             "disabledAt": "Gesperrt am",
             "reasonCategory": "Kategorie",
             "reasonDescription": "Beschreibung",
-            "createdAt": "Datum",
             "submitter": "Gemeldet von",
             "decideModal": {
               "submit": "Bestätige Entscheidung",
@@ -394,6 +393,7 @@
     "report": {
         "submit": "Meldung senden",
         "cancel": "Abbrechen",
+        "success": "Vielen Dank für diese Meldung!",
         "user": {
             "title": "Nutzer melden",
             "type": "Nutzer",
@@ -412,8 +412,6 @@
             "message": "Bist Du sicher, dass Du den Kommentar von „<b>{name}<\/b>“ melden möchtest?",
             "error": "Du hast den Kommentar bereits gemeldet!"
         },
-        "author": "Verfasser",
-        "success": "Vielen Dank für diese Meldung!",
         "reason": {
             "category": {
                 "label": "Wähle eine Kategorie:",
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index b082a5111..41d7b7f30 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -499,7 +499,6 @@
       "disabledAt": "Disabled at",
       "reasonCategory": "Category",
       "reasonDescription": "Description",
-      "createdAt": "Date",
       "submitter": "Reported by",
       "decideModal": {
         "submit": "Confirm decision",
@@ -595,7 +594,6 @@
       "message": "Do you really want to report the comment from \"<b>{name}</b>\"?",
       "error": "You have already reported the comment!"
     },
-    "author": "Author",
     "reason": {
       "category": {
         "label": "Select a category:",

From a8a99e763ce7a1d9122aee666ea9c163d8fdf81e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Sat, 23 Nov 2019 11:05:41 +0100
Subject: [PATCH 069/174] Fix client-side rendered virtual DOM warnings

---
 webapp/pages/moderation/index.vue | 147 ++++++++++++++++--------------
 1 file changed, 77 insertions(+), 70 deletions(-)

diff --git a/webapp/pages/moderation/index.vue b/webapp/pages/moderation/index.vue
index eecf2104b..6c7cd32e1 100644
--- a/webapp/pages/moderation/index.vue
+++ b/webapp/pages/moderation/index.vue
@@ -226,79 +226,13 @@ export default {
       }
     },
   },
-  methods: {
-    confirm(content) {
-      this.openModal(content)
-    },
-    async confirmCallback(resourceId) {
-      this.$apollo
-        .mutate({
-          mutation: reviewMutation(),
-          variables: { resourceId, closed: true },
-        })
-        .then(() => {
-          this.$toast.success(this.$t('moderation.reports.DecisionSuccess'))
-          this.$apollo.queries.reports.refetch()
-        })
-        .catch(error => this.$toast.error(error.message))
-    },
-    openModal(content) {
-      const identStart =
-        'moderation.reports.decideModal.' +
-        content.type +
-        '.' +
-        (content.latestClaim.disable ? 'disable' : 'enable')
-      this.$store.commit('modal/SET_OPEN', {
-        name: 'confirm',
-        data: {
-          type: content.type,
-          resource: content.resource,
-          modalData: {
-            titleIdent: identStart + '.title',
-            messageIdent: identStart + '.message',
-            messageParams: {
-              name:
-                content.type === 'User'
-                  ? content.user.name
-                  : content.type === 'Post'
-                  ? this.$filters.truncate(content.post.title, 30)
-                  : content.type === 'Comment'
-                  ? this.$filters.truncate(
-                      this.$filters.removeHtml(content.comment.contentExcerpt),
-                      30,
-                    )
-                  : '',
-            },
-            buttons: {
-              confirm: {
-                danger: true,
-                icon: content.resource.disabled ? 'eye-slash' : 'eye',
-                textIdent: 'moderation.reports.decideModal.submit',
-                callback: () => {
-                  this.confirmCallback(content.resource.id)
-                },
-              },
-              cancel: {
-                icon: 'close',
-                textIdent: 'moderation.reports.decideModal.cancel',
-                callback: () => {},
-              },
-            },
-          },
-        },
-      })
-    },
-  },
-  apollo: {
+  watch: {
     reports: {
-      query: reportListQuery(),
-      variables() {
-        return {}
-      },
-      update({ reports }) {
+      immediate: true,
+      handler(newReports) {
         const newResourcesClaims = []
 
-        reports.forEach(report => {
+        newReports.forEach(report => {
           const resource =
             report.type === 'User'
               ? report.user
@@ -373,6 +307,79 @@ export default {
         )
         
         this.resourcesClaims = newResourcesClaims
+      },
+    },
+  },
+  methods: {
+    confirm(content) {
+      this.openModal(content)
+    },
+    async confirmCallback(resourceId) {
+      this.$apollo
+        .mutate({
+          mutation: reviewMutation(),
+          variables: { resourceId, closed: true },
+        })
+        .then(() => {
+          this.$toast.success(this.$t('moderation.reports.DecisionSuccess'))
+          this.$apollo.queries.reports.refetch()
+        })
+        .catch(error => this.$toast.error(error.message))
+    },
+    openModal(content) {
+      const identStart =
+        'moderation.reports.decideModal.' +
+        content.type +
+        '.' +
+        (content.latestClaim.disable ? 'disable' : 'enable')
+      this.$store.commit('modal/SET_OPEN', {
+        name: 'confirm',
+        data: {
+          type: content.type,
+          resource: content.resource,
+          modalData: {
+            titleIdent: identStart + '.title',
+            messageIdent: identStart + '.message',
+            messageParams: {
+              name:
+                content.type === 'User'
+                  ? content.user.name
+                  : content.type === 'Post'
+                  ? this.$filters.truncate(content.post.title, 30)
+                  : content.type === 'Comment'
+                  ? this.$filters.truncate(
+                      this.$filters.removeHtml(content.comment.contentExcerpt),
+                      30,
+                    )
+                  : '',
+            },
+            buttons: {
+              confirm: {
+                danger: true,
+                icon: content.resource.disabled ? 'eye-slash' : 'eye',
+                textIdent: 'moderation.reports.decideModal.submit',
+                callback: () => {
+                  this.confirmCallback(content.resource.id)
+                },
+              },
+              cancel: {
+                icon: 'close',
+                textIdent: 'moderation.reports.decideModal.cancel',
+                callback: () => {},
+              },
+            },
+          },
+        },
+      })
+    },
+  },
+  apollo: {
+    reports: {
+      query: reportListQuery(),
+      variables() {
+        return {}
+      },
+      update({ reports }) {
         return reports
       },
       fetchPolicy: 'cache-and-network',

From 116d597d2473de7c27cf7d73cf1ee673ba14fab6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Sat, 23 Nov 2019 11:11:00 +0100
Subject: [PATCH 070/174] Cleaned SCSS

---
 webapp/pages/moderation/index.vue | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/webapp/pages/moderation/index.vue b/webapp/pages/moderation/index.vue
index 6c7cd32e1..26a86fb33 100644
--- a/webapp/pages/moderation/index.vue
+++ b/webapp/pages/moderation/index.vue
@@ -389,10 +389,6 @@ export default {
 </script>
 
 <style lang="scss">
-// Wolle delete?
-.ds-table-head-col-border {
-  border-bottom: $border-color-softer dotted $border-size-base;
-}
 .decision {
   color: $color-secondary;
 }

From 8a4ca956e8f8db9db35dd636e48d6442584c9943 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Sat, 23 Nov 2019 11:20:16 +0100
Subject: [PATCH 071/174] Rename variable

---
 webapp/pages/moderation/index.vue | 92 +++++++++++++++----------------
 1 file changed, 46 insertions(+), 46 deletions(-)

diff --git a/webapp/pages/moderation/index.vue b/webapp/pages/moderation/index.vue
index 26a86fb33..fe4a58a35 100644
--- a/webapp/pages/moderation/index.vue
+++ b/webapp/pages/moderation/index.vue
@@ -8,15 +8,15 @@
       cellpadding="0"
     >
       <colgroup><col width="" /></colgroup>
-      <template v-for="content in resourcesClaims">
+      <template v-for="resourceClaims in resourcesClaims">
         <thead
           :class="[
-            content.latestClaim.closed ? 'decision' : 'no-decision',
+            resourceClaims.latestClaim.closed ? 'decision' : 'no-decision',
             'ds-table-col',
             'ds-table-head-col',
             'ds-table-head-col-border',
           ]"
-          :key="'thead-' + content.resource.id"
+          :key="'thead-' + resourceClaims.resource.id"
         >
           <tr valign="top">
             <th>
@@ -33,57 +33,57 @@
             </th>
           </tr>
         </thead>
-        <tbody :key="'tbody-' + content.resource.id">
+        <tbody :key="'tbody-' + resourceClaims.resource.id">
           <tr valign="top">
             <td class="ds-table-col ds-table-head-col ds-table-head-col-border">
               <!-- Icon -->
               <ds-text color="soft">
                 <ds-icon
-                  v-if="content.type === 'Post'"
-                  v-tooltip="{ content: $t('report.contribution.type'), placement: 'right' }"
+                  v-if="resourceClaims.type === 'Post'"
+                  v-tooltip="{ resourceClaims: $t('report.contribution.type'), placement: 'right' }"
                   name="bookmark"
                 />
                 <ds-icon
-                  v-else-if="content.type === 'Comment'"
-                  v-tooltip="{ content: $t('report.comment.type'), placement: 'right' }"
+                  v-else-if="resourceClaims.type === 'Comment'"
+                  v-tooltip="{ resourceClaims: $t('report.comment.type'), placement: 'right' }"
                   name="comments"
                 />
                 <ds-icon
-                  v-else-if="content.type === 'User'"
-                  v-tooltip="{ content: $t('report.user.type'), placement: 'right' }"
+                  v-else-if="resourceClaims.type === 'User'"
+                  v-tooltip="{ resourceClaims: $t('report.user.type'), placement: 'right' }"
                   name="user"
                 />
-                <ds-icon v-if="content.resource.disabled" name="eye-slash" class="ban" />
+                <ds-icon v-if="resourceClaims.resource.disabled" name="eye-slash" class="ban" />
                 <ds-icon v-else name="eye" class="no-ban" />
               </ds-text>
             </td>
             <td class="ds-table-col ds-table-head-col-border">
-              <!-- reported user or content -->
-              <div v-if="content.type === 'Post' || content.type === 'Comment'">
+              <!-- reported user or other resource -->
+              <div v-if="resourceClaims.type === 'Post' || resourceClaims.type === 'Comment'">
                 <nuxt-link
                   :to="{
                     name: 'post-id-slug',
                     params: {
-                      id: content.type === 'Post' ? content.post.id : content.comment.post.id,
-                      slug: content.type === 'Post' ? content.post.slug : content.comment.post.slug,
+                      id: resourceClaims.type === 'Post' ? resourceClaims.post.id : resourceClaims.comment.post.id,
+                      slug: resourceClaims.type === 'Post' ? resourceClaims.post.slug : resourceClaims.comment.post.slug,
                     },
                     hash:
-                      content.type === 'Comment' ? `#commentId-${content.comment.id}` : undefined,
+                      resourceClaims.type === 'Comment' ? `#commentId-${resourceClaims.comment.id}` : undefined,
                   }"
                 >
-                  <b v-if="content.type === 'Post'">{{ content.post.title | truncate(100) }}</b>
-                  <b v-else>{{ content.comment.contentExcerpt | removeHtml | truncate(100) }}</b>
+                  <b v-if="resourceClaims.type === 'Post'">{{ resourceClaims.post.title | truncate(100) }}</b>
+                  <b v-else>{{ resourceClaims.comment.contentExcerpt | removeHtml | truncate(100) }}</b>
                 </nuxt-link>
               </div>
               <div v-else>
-                <hc-user :user="content.user" :showAvatar="false" :trunc="30" />
+                <hc-user :user="resourceClaims.user" :showAvatar="false" :trunc="30" />
               </div>
             </td>
             <!-- contentBelongsToUser -->
             <td class="ds-table-col ds-table-head-col-border">
               <hc-user
-                v-if="content.contentBelongsToUser"
-                :user="content.contentBelongsToUser"
+                v-if="resourceClaims.contentBelongsToUser"
+                :user="resourceClaims.contentBelongsToUser"
                 :showAvatar="false"
                 :trunc="30"
               />
@@ -91,22 +91,22 @@
             </td>
             <td class="ds-table-col ds-table-head-col-border">
               <!-- latestClaim.closed -->
-              <b v-if="content.latestClaim.closed">
+              <b v-if="resourceClaims.latestClaim.closed">
                 {{ $t('moderation.reports.decided') }}
               </b>
               <ds-button
                 v-else
                 danger
                 class="confirm"
-                :icon="content.resource.disabled ? 'eye-slash' : 'eye'"
-                @click="confirm(content)"
+                :icon="resourceClaims.resource.disabled ? 'eye-slash' : 'eye'"
+                @click="confirm(resourceClaims)"
               >
                 {{ $t('moderation.reports.decideButton') }}
               </ds-button>
               <!-- reviewedByModerator -->
-              <div v-if="content.resource.reviewedByModerator">
+              <div v-if="resourceClaims.resource.reviewedByModerator">
                 <br />
-                <div v-if="content.latestClaim.disable">
+                <div v-if="resourceClaims.latestClaim.disable">
                   <ds-icon name="eye-slash" class="ban" />
                   {{ $t('moderation.reports.disabledBy') }}
                 </div>
@@ -115,16 +115,16 @@
                   {{ $t('moderation.reports.enabledBy') }}
                 </div>
                 <hc-user
-                  :user="content.resource.reviewedByModerator"
+                  :user="resourceClaims.resource.reviewedByModerator"
                   :showAvatar="false"
                   :trunc="30"
-                  :date-time="content.latestClaim.updatedAt"
+                  :date-time="resourceClaims.latestClaim.updatedAt"
                   positionDatetime="below"
                 />
               </div>
               <div v-else>
                 <br />
-                <div v-if="content.resource.disabled">
+                <div v-if="resourceClaims.resource.disabled">
                   <ds-icon name="eye-slash" class="ban" />
                   {{ $t('moderation.reports.disabled') }}
                 </div>
@@ -138,7 +138,7 @@
           <tr>
             <td class="ds-table-col ds-table-head-col-border"></td>
             <td class="ds-table-col ds-table-head-col-border" colspan="3">
-              <template v-for="(claim, indexClaim) in content.claims">
+              <template v-for="(claim, indexClaim) in resourceClaims.claims">
                 <div :key="claim.id">
                   <!-- previousDecision -->
                   <div v-if="indexClaim > 0">
@@ -242,7 +242,7 @@ export default {
               ? report.comment
               : undefined
           let idxResource = newResourcesClaims.findIndex(
-            content => content.resource.id === resource.id,
+            resourceClaims => resourceClaims.resource.id === resource.id,
           )
           // if resource is not in resource list, then add it
           if (idxResource === -1) {
@@ -311,8 +311,8 @@ export default {
     },
   },
   methods: {
-    confirm(content) {
-      this.openModal(content)
+    confirm(resourceClaims) {
+      this.openModal(resourceClaims)
     },
     async confirmCallback(resourceId) {
       this.$apollo
@@ -326,29 +326,29 @@ export default {
         })
         .catch(error => this.$toast.error(error.message))
     },
-    openModal(content) {
+    openModal(resourceClaims) {
       const identStart =
         'moderation.reports.decideModal.' +
-        content.type +
+        resourceClaims.type +
         '.' +
-        (content.latestClaim.disable ? 'disable' : 'enable')
+        (resourceClaims.latestClaim.disable ? 'disable' : 'enable')
       this.$store.commit('modal/SET_OPEN', {
         name: 'confirm',
         data: {
-          type: content.type,
-          resource: content.resource,
+          type: resourceClaims.type,
+          resource: resourceClaims.resource,
           modalData: {
             titleIdent: identStart + '.title',
             messageIdent: identStart + '.message',
             messageParams: {
               name:
-                content.type === 'User'
-                  ? content.user.name
-                  : content.type === 'Post'
-                  ? this.$filters.truncate(content.post.title, 30)
-                  : content.type === 'Comment'
+                resourceClaims.type === 'User'
+                  ? resourceClaims.user.name
+                  : resourceClaims.type === 'Post'
+                  ? this.$filters.truncate(resourceClaims.post.title, 30)
+                  : resourceClaims.type === 'Comment'
                   ? this.$filters.truncate(
-                      this.$filters.removeHtml(content.comment.contentExcerpt),
+                      this.$filters.removeHtml(resourceClaims.comment.contentExcerpt),
                       30,
                     )
                   : '',
@@ -356,10 +356,10 @@ export default {
             buttons: {
               confirm: {
                 danger: true,
-                icon: content.resource.disabled ? 'eye-slash' : 'eye',
+                icon: resourceClaims.resource.disabled ? 'eye-slash' : 'eye',
                 textIdent: 'moderation.reports.decideModal.submit',
                 callback: () => {
-                  this.confirmCallback(content.resource.id)
+                  this.confirmCallback(resourceClaims.resource.id)
                 },
               },
               cancel: {

From 4c9167583877e9c804c8a1d4c2f20e8d615bf967 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Sat, 23 Nov 2019 11:40:21 +0100
Subject: [PATCH 072/174] Fix lint

---
 backend/src/seed/seed-db.js       |  4 ++--
 webapp/pages/moderation/index.vue | 38 ++++++++++++++++++-------------
 2 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/backend/src/seed/seed-db.js b/backend/src/seed/seed-db.js
index cf29389d4..6c0674d73 100644
--- a/backend/src/seed/seed-db.js
+++ b/backend/src/seed/seed-db.js
@@ -828,7 +828,7 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
         variables: {
           resourceId: 'p2',
           reasonCategory: 'doxing',
-          reasonDescription: "I think it is my friends data!",
+          reasonDescription: 'I think it is my friends data!',
         },
       }),
     ])
@@ -869,7 +869,7 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
         variables: {
           resourceId: 'p2',
           reasonCategory: 'doxing',
-          reasonDescription: "I think it is my friends data again!",
+          reasonDescription: 'I think it is my friends data again!',
         },
       }),
     ])
diff --git a/webapp/pages/moderation/index.vue b/webapp/pages/moderation/index.vue
index fe4a58a35..4914c10e5 100644
--- a/webapp/pages/moderation/index.vue
+++ b/webapp/pages/moderation/index.vue
@@ -64,15 +64,27 @@
                   :to="{
                     name: 'post-id-slug',
                     params: {
-                      id: resourceClaims.type === 'Post' ? resourceClaims.post.id : resourceClaims.comment.post.id,
-                      slug: resourceClaims.type === 'Post' ? resourceClaims.post.slug : resourceClaims.comment.post.slug,
+                      id:
+                        resourceClaims.type === 'Post'
+                          ? resourceClaims.post.id
+                          : resourceClaims.comment.post.id,
+                      slug:
+                        resourceClaims.type === 'Post'
+                          ? resourceClaims.post.slug
+                          : resourceClaims.comment.post.slug,
                     },
                     hash:
-                      resourceClaims.type === 'Comment' ? `#commentId-${resourceClaims.comment.id}` : undefined,
+                      resourceClaims.type === 'Comment'
+                        ? `#commentId-${resourceClaims.comment.id}`
+                        : undefined,
                   }"
                 >
-                  <b v-if="resourceClaims.type === 'Post'">{{ resourceClaims.post.title | truncate(100) }}</b>
-                  <b v-else>{{ resourceClaims.comment.contentExcerpt | removeHtml | truncate(100) }}</b>
+                  <b v-if="resourceClaims.type === 'Post'">
+                    {{ resourceClaims.post.title | truncate(100) }}
+                  </b>
+                  <b v-else>
+                    {{ resourceClaims.comment.contentExcerpt | removeHtml | truncate(100) }}
+                  </b>
                 </nuxt-link>
               </div>
               <div v-else>
@@ -144,7 +156,7 @@
                   <div v-if="indexClaim > 0">
                     <ds-flex gutter="small">
                       <ds-flex-item width="25%">
-                       <b>{{ $t('moderation.reports.previousDecision') }}</b>
+                        <b>{{ $t('moderation.reports.previousDecision') }}</b>
                       </ds-flex-item>
                       <ds-flex-item>
                         <div>
@@ -279,9 +291,7 @@ export default {
         // sorting of resource claims and their reports
         newResourcesClaims.forEach(resourceClaims => {
           // latestClaim by updatedAt rules
-          resourceClaims.claims.sort(
-            (a, b) => new Date(b.updatedAt) - new Date(a.updatedAt),
-          )
+          resourceClaims.claims.sort((a, b) => new Date(b.updatedAt) - new Date(a.updatedAt))
           resourceClaims.latestClaim = {
             id: resourceClaims.claims[0].id,
             createdAt: resourceClaims.claims[0].createdAt,
@@ -290,22 +300,18 @@ export default {
             closed: resourceClaims.claims[0].closed,
           }
           // display claims always by starting with latest createdAt
-          resourceClaims.claims.sort(
-            (a, b) => new Date(b.createdAt) - new Date(a.createdAt),
-          )
+          resourceClaims.claims.sort((a, b) => new Date(b.createdAt) - new Date(a.createdAt))
 
           resourceClaims.claims.forEach(claim => {
             // display reports always by starting with latest createdAt
-            claim.reports.sort(
-              (a, b) => new Date(b.createdAt) - new Date(a.createdAt),
-            )
+            claim.reports.sort((a, b) => new Date(b.createdAt) - new Date(a.createdAt))
           })
         })
         // display resources by starting with claims by their latest createdAt
         newResourcesClaims.sort(
           (a, b) => new Date(b.claims[0].createdAt) - new Date(a.claims[0].createdAt),
         )
-        
+
         this.resourcesClaims = newResourcesClaims
       },
     },

From 043b9514599f7acf443b4344e802907e305ccfdf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Sat, 23 Nov 2019 11:42:46 +0100
Subject: [PATCH 073/174] Try avoid modal to show success on error, but not
 successful

---
 webapp/components/Modal/ConfirmModal.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/webapp/components/Modal/ConfirmModal.vue b/webapp/components/Modal/ConfirmModal.vue
index 71f0dc40e..8297e6d0f 100644
--- a/webapp/components/Modal/ConfirmModal.vue
+++ b/webapp/components/Modal/ConfirmModal.vue
@@ -77,7 +77,6 @@ export default {
           }, 500)
         }, 1500)
       } catch (err) {
-        this.success = false
         this.isOpen = false
       } finally {
         this.loading = false

From 1574a6cdb63a375e61df07dc9d172e4817f01223 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Sat, 23 Nov 2019 12:32:01 +0100
Subject: [PATCH 074/174] Check database manipulation script again

---
 ...case_node.sh => change_disabled_relationship_to_claim_node.sh} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename neo4j/{change_disabled_relationship_to_case_node.sh => change_disabled_relationship_to_claim_node.sh} (100%)

diff --git a/neo4j/change_disabled_relationship_to_case_node.sh b/neo4j/change_disabled_relationship_to_claim_node.sh
similarity index 100%
rename from neo4j/change_disabled_relationship_to_case_node.sh
rename to neo4j/change_disabled_relationship_to_claim_node.sh

From 4d645ebc04d07dafdb04855aca9c97bee899b022 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Sat, 23 Nov 2019 13:11:09 +0100
Subject: [PATCH 075/174] Correct mutation to display the comment disabling
 right

---
 webapp/graphql/Moderation.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/webapp/graphql/Moderation.js b/webapp/graphql/Moderation.js
index 9ade5c414..a50e44e56 100644
--- a/webapp/graphql/Moderation.js
+++ b/webapp/graphql/Moderation.js
@@ -47,6 +47,8 @@ export const reportListQuery = () => {
         comment {
           id
           contentExcerpt
+          disabled
+          deleted
           author {
             id
             slug

From 1a5fd29922ad348ef5590af2c1498780439b9a34 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Mon, 25 Nov 2019 17:04:47 +0100
Subject: [PATCH 076/174] Add Claim model

---
 backend/src/models/Claim.js          | 53 ++++++++++++++++++++++++++++
 backend/src/models/index.js          |  1 +
 backend/src/seed/factories/claims.js |  7 ++++
 backend/src/seed/factories/index.js  |  2 ++
 4 files changed, 63 insertions(+)
 create mode 100644 backend/src/models/Claim.js
 create mode 100644 backend/src/seed/factories/claims.js

diff --git a/backend/src/models/Claim.js b/backend/src/models/Claim.js
new file mode 100644
index 000000000..ac41f9b77
--- /dev/null
+++ b/backend/src/models/Claim.js
@@ -0,0 +1,53 @@
+import uuid from 'uuid/v4'
+
+module.exports = {
+  id: { type: 'string', primary: true, default: uuid },
+  createdAt: { type: 'string', isoDate: true, default: () => new Date().toISOString() },
+  updatedAt: { type: 'string', isoDate: true, default: () => new Date().toISOString() },
+  rule: { type: 'string', default: 'latestReviewUpdatedAtRules' },
+  disable: { type: 'boolean', default: false },
+  closed: { type: 'boolean', default: false },
+  belongsTo: {
+    type: 'relationship',
+    relationship: 'BELONGS_TO',
+    target: ['User', 'Comment', 'Post'],
+    direction: 'out',
+  },
+  reported: {
+    type: 'relationship',
+    relationship: 'REPORTED',
+    target: 'User',
+    direction: 'in',
+    properties: {
+      createdAt: { type: 'string', isoDate: true, default: () => new Date().toISOString() },
+      resourceId: { type: 'string', primary: true, default: uuid },
+      reasonCategory: {
+        type: 'string',
+        valid: [
+          'other',
+          'discrimination_etc',
+          'pornographic_content_links',
+          'glorific_trivia_of_cruel_inhuman_acts',
+          'doxing',
+          'intentional_intimidation_stalking_persecution',
+          'advert_products_services_commercial',
+          'criminal_behavior_violation_german_law',
+        ],
+        invalid: [null],
+      },
+      reasonDescription: { type: 'string', allow: [null] },
+    },
+  },
+  reviewed: {
+    type: 'relationship',
+    relationship: 'REVIEWED',
+    target: 'User',
+    direction: 'in',
+    properties: {
+      createdAt: { type: 'string', isoDate: true, default: () => new Date().toISOString() },
+      updatedAt: { type: 'string', isoDate: true, default: () => new Date().toISOString() },
+      disable: { type: 'boolean', default: false },
+      closed: { type: 'boolean', default: false },
+    },
+  },
+}
diff --git a/backend/src/models/index.js b/backend/src/models/index.js
index bd89ddc51..9f6868025 100644
--- a/backend/src/models/index.js
+++ b/backend/src/models/index.js
@@ -13,4 +13,5 @@ export default {
   Tag: require('./Tag.js'),
   Location: require('./Location.js'),
   Donations: require('./Donations.js'),
+  Claim: require('./Claim.js'),
 }
diff --git a/backend/src/seed/factories/claims.js b/backend/src/seed/factories/claims.js
new file mode 100644
index 000000000..0c18da783
--- /dev/null
+++ b/backend/src/seed/factories/claims.js
@@ -0,0 +1,7 @@
+export default function create() {
+  return {
+    factory: async ({ args, neodeInstance }) => {
+      return neodeInstance.create('Claim', args)
+    },
+  }
+}
diff --git a/backend/src/seed/factories/index.js b/backend/src/seed/factories/index.js
index 5054155fc..27ec83621 100644
--- a/backend/src/seed/factories/index.js
+++ b/backend/src/seed/factories/index.js
@@ -10,6 +10,7 @@ import createLocation from './locations.js'
 import createEmailAddress from './emailAddresses.js'
 import createDonations from './donations.js'
 import createUnverifiedEmailAddresss from './unverifiedEmailAddresses.js'
+import createClaim from './claims.js'
 
 const factories = {
   Badge: createBadge,
@@ -23,6 +24,7 @@ const factories = {
   EmailAddress: createEmailAddress,
   UnverifiedEmailAddress: createUnverifiedEmailAddresss,
   Donations: createDonations,
+  Claim: createClaim,
 }
 
 export const cleanDatabase = async (options = {}) => {

From f36ae9a63cb938adbe6179252d28d980b97c8869 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Mon, 25 Nov 2019 17:05:04 +0100
Subject: [PATCH 077/174] Refactor softDeleteMiddleware spec

- We have been using http requests in our set up in this file, which can
be avoided. We are not trying to test that the report/review workflow
works properly here, we are trying to test that if a resource was
reported, and then disabled, some conditions are true. Certainly, we
will have tests that check that the report, review workflow works as
expected.
---
 .../softDelete/softDeleteMiddleware.spec.js   | 119 +++++++++---------
 1 file changed, 60 insertions(+), 59 deletions(-)

diff --git a/backend/src/middleware/softDelete/softDeleteMiddleware.spec.js b/backend/src/middleware/softDelete/softDeleteMiddleware.spec.js
index 7102b88cc..46f768384 100644
--- a/backend/src/middleware/softDelete/softDeleteMiddleware.spec.js
+++ b/backend/src/middleware/softDelete/softDeleteMiddleware.spec.js
@@ -8,14 +8,8 @@ const factory = Factory()
 const neode = getNeode()
 const driver = getDriver()
 
-let query
-let mutate
-let graphqlQuery
 const categoryIds = ['cat9']
-let authenticatedUser
-let user
-let moderator
-let troll
+let query, graphqlQuery, authenticatedUser, user, moderator, troll
 
 const action = () => {
   return query({ query: graphqlQuery })
@@ -38,18 +32,17 @@ beforeAll(async () => {
       avatar: '/some/offensive/avatar.jpg',
       about: 'This self description is very offensive',
     }),
+    neode.create('Category', {
+      id: 'cat9',
+      name: 'Democracy & Politics',
+      icon: 'university',
+    }),
   ])
 
   user = users[0]
   moderator = users[1]
   troll = users[2]
 
-  await neode.create('Category', {
-    id: 'cat9',
-    name: 'Democracy & Politics',
-    icon: 'university',
-  })
-
   await Promise.all([
     user.relateTo(troll, 'following'),
     factory.create('Post', {
@@ -70,33 +63,32 @@ beforeAll(async () => {
     }),
   ])
 
-  await Promise.all([
+  const resources = await Promise.all([
     factory.create('Comment', {
       author: user,
       id: 'c2',
       postId: 'p3',
       content: 'Enabled comment on public post',
     }),
+    factory.create('Post', {
+      id: 'p2',
+      author: troll,
+      title: 'Disabled post',
+      content: 'This is an offensive post content',
+      contentExcerpt: 'This is an offensive post content',
+      image: '/some/offensive/image.jpg',
+      deleted: false,
+      categoryIds,
+    }),
+    factory.create('Comment', {
+      id: 'c1',
+      author: troll,
+      postId: 'p3',
+      content: 'Disabled comment',
+      contentExcerpt: 'Disabled comment',
+    }),
   ])
 
-  await factory.create('Post', {
-    id: 'p2',
-    author: troll,
-    title: 'Disabled post',
-    content: 'This is an offensive post content',
-    contentExcerpt: 'This is an offensive post content',
-    image: '/some/offensive/image.jpg',
-    deleted: false,
-    categoryIds,
-  })
-  await factory.create('Comment', {
-    id: 'c1',
-    author: troll,
-    postId: 'p3',
-    content: 'Disabled comment',
-    contentExcerpt: 'Disabled comment',
-  })
-
   const { server } = createServer({
     context: () => {
       return {
@@ -108,48 +100,57 @@ beforeAll(async () => {
   })
   const client = createTestClient(server)
   query = client.query
-  mutate = client.mutate
 
-  authenticatedUser = await moderator.toJson()
-  const reportMutation = gql`
-    mutation($resourceId: ID!, $reasonCategory: ReasonCategory!, $reasonDescription: String!) {
-      report(
-        resourceId: $resourceId
-        reasonCategory: $reasonCategory
-        reasonDescription: $reasonDescription
-      ) {
-        type
-      }
-    }
-  `
+  const trollingPost = resources[1]
+  const trollingComment = resources[2]
+
+  const claims = await Promise.all([
+    factory.create('Claim'),
+    factory.create('Claim'),
+    factory.create('Claim'),
+  ])
+  const claimAgainstTroll = claims[0]
+  const claimAgainstTrollingPost = claims[1]
+  const claimAgainstTrollingComment = claims[2]
+
   const reportVariables = {
     resourceId: 'undefined-resource',
     reasonCategory: 'discrimination_etc',
     reasonDescription: 'I am what I am !!!',
   }
+
   await Promise.all([
-    mutate({ mutation: reportMutation, variables: { ...reportVariables, resourceId: 'c1' } }),
-    mutate({ mutation: reportMutation, variables: { ...reportVariables, resourceId: 'u2' } }),
-    mutate({ mutation: reportMutation, variables: { ...reportVariables, resourceId: 'p2' } }),
+    claimAgainstTroll.relateTo(user, 'reported', { ...reportVariables, resourceId: 'u2' }),
+    claimAgainstTroll.relateTo(troll, 'belongsTo'),
+    claimAgainstTrollingPost.relateTo(user, 'reported', { ...reportVariables, resourceId: 'p2' }),
+    claimAgainstTrollingPost.relateTo(trollingPost, 'belongsTo'),
+    claimAgainstTrollingComment.relateTo(moderator, 'reported', {
+      ...reportVariables,
+      resourceId: 'c1',
+    }),
+    claimAgainstTrollingComment.relateTo(trollingComment, 'belongsTo'),
   ])
-  const reviewMutation = gql`
-    mutation($resourceId: ID!, $disable: Boolean, $closed: Boolean) {
-      review(resourceId: $resourceId, disable: $disable, closed: $closed) {
-        disable
-      }
-    }
-  `
+
   const disableVariables = {
     resourceId: 'undefined-resource',
     disable: true,
     closed: false,
   }
+
   await Promise.all([
-    mutate({ mutation: reviewMutation, variables: { ...disableVariables, resourceId: 'c1' } }),
-    mutate({ mutation: reviewMutation, variables: { ...disableVariables, resourceId: 'u2' } }),
-    mutate({ mutation: reviewMutation, variables: { ...disableVariables, resourceId: 'p2' } }),
+    claimAgainstTroll.relateTo(moderator, 'reviewed', { ...disableVariables, resourceId: 'u2' }),
+    troll.update({ disabled: true, updatedAt: new Date().toISOString() }),
+    claimAgainstTrollingPost.relateTo(moderator, 'reviewed', {
+      ...disableVariables,
+      resourceId: 'p2',
+    }),
+    trollingPost.update({ disabled: true, updatedAt: new Date().toISOString() }),
+    claimAgainstTrollingComment.relateTo(moderator, 'reviewed', {
+      ...disableVariables,
+      resourceId: 'c1',
+    }),
+    trollingComment.update({ disabled: true, updatedAt: new Date().toISOString() }),
   ])
-  authenticatedUser = null
 })
 
 afterAll(async () => {

From 38c5b9e4ec2ef4cb517ecfec47095ce1799cb911 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Mon, 25 Nov 2019 18:56:58 +0100
Subject: [PATCH 078/174] Refactor reports resolver, REPORTED type

- return Claim instead of setting more properties on relationship
REPORTED
- use readTransaction for query to benefit from autmatic retries, follow
neo4j suggestion
- use map instead of forEach https://codeburst.io/javascript-map-vs-foreach-f38111822c0f
---
 backend/src/schema/resolvers/reports.js    | 81 ++++++++++------------
 backend/src/schema/types/type/REPORTED.gql |  9 +--
 2 files changed, 38 insertions(+), 52 deletions(-)

diff --git a/backend/src/schema/resolvers/reports.js b/backend/src/schema/resolvers/reports.js
index ca5a1ced3..f5b9b7d0e 100644
--- a/backend/src/schema/resolvers/reports.js
+++ b/backend/src/schema/resolvers/reports.js
@@ -30,9 +30,9 @@ export default {
           },
         )
         return reportRelationshipTransactionResponse.records.map(record => ({
-          submitter: record.get('submitter'),
-          report: record.get('report'),
-          claim: record.get('claim'),
+          submitter: record.get('submitter').properties,
+          report: record.get('report').properties,
+          claim: record.get('claim').properties,
           resource: record.get('resource').properties,
           type: record.get('type'),
         }))
@@ -42,16 +42,12 @@ export default {
         if (!txResult[0]) return null
         const { submitter, report, claim, resource, type } = txResult[0]
         createdRelationshipWithNestedAttributes = {
-          ...report.properties,
-          claimId: claim.properties.id,
-          claimCreatedAt: claim.properties.createdAt,
-          claimUpdatedAt: claim.properties.updatedAt,
-          claimDisable: claim.properties.disable,
-          claimClosed: claim.properties.closed,
+          ...report,
+          claim,
           post: null,
           comment: null,
           user: null,
-          submitter: submitter.properties,
+          submitter,
           type,
         }
         switch (type) {
@@ -75,8 +71,7 @@ export default {
     reports: async (_parent, params, context, _resolveInfo) => {
       const { driver } = context
       const session = driver.session()
-      let response
-      let orderByClause
+      let reports, orderByClause
       switch (params.orderBy) {
         case 'createdAt_asc':
           orderByClause = 'ORDER BY claim.createdAt ASC, report.createdAt DESC'
@@ -87,61 +82,55 @@ export default {
         default:
           orderByClause = ''
       }
-      try {
-        const cypher = `
+      const readTxPromise = session.readTransaction(async tx => {
+        const allReportsTransactionResponse = await tx.run(
+          `
           MATCH (submitter:User)-[report:REPORTED]->(claim:Claim)-[:BELONGS_TO]->(resource)
           WHERE resource:User OR resource:Post OR resource:Comment
           RETURN submitter, report, claim, resource, labels(resource)[0] as type
           ${orderByClause}
-        `
-        const result = await session.run(cypher, {})
-        const dbResponse = result.records.map(r => {
-          return {
-            submitter: r.get('submitter'),
-            report: r.get('report'),
-            claim: r.get('claim'),
-            resource: r.get('resource'),
-            type: r.get('type'),
-          }
-        })
-        if (!dbResponse) return null
-
-        response = []
-        dbResponse.forEach(ele => {
-          const { report, submitter, claim, resource, type } = ele
-
-          const responseEle = {
-            ...report.properties,
-            claimId: claim.properties.id,
-            claimCreatedAt: claim.properties.createdAt,
-            claimUpdatedAt: claim.properties.updatedAt,
-            claimDisable: claim.properties.disable,
-            claimClosed: claim.properties.closed,
+          `,
+          {},
+        )
+        return allReportsTransactionResponse.records.map(record => ({
+          submitter: record.get('submitter').properties,
+          report: record.get('report').properties,
+          claim: record.get('claim').properties,
+          resource: record.get('resource').properties,
+          type: record.get('type'),
+        }))
+      })
+      try {
+        const txResult = await readTxPromise
+        if (!txResult[0]) return null
+        reports = txResult.map(reportedRecord => {
+          const { report, submitter, claim, resource, type } = reportedRecord
+          const relationshipWithNestedAttributes = {
+            ...report,
+            claim,
             post: null,
             comment: null,
             user: null,
-            submitter: submitter.properties,
+            submitter,
             type,
           }
-
           switch (type) {
             case 'Post':
-              responseEle.post = resource.properties
+              relationshipWithNestedAttributes.post = resource
               break
             case 'Comment':
-              responseEle.comment = resource.properties
+              relationshipWithNestedAttributes.comment = resource
               break
             case 'User':
-              responseEle.user = resource.properties
+              relationshipWithNestedAttributes.user = resource
               break
           }
-          response.push(responseEle)
+          return relationshipWithNestedAttributes
         })
       } finally {
         session.close()
       }
-
-      return response
+      return reports
     },
   },
 }
diff --git a/backend/src/schema/types/type/REPORTED.gql b/backend/src/schema/types/type/REPORTED.gql
index d59b720c2..f610a657c 100644
--- a/backend/src/schema/types/type/REPORTED.gql
+++ b/backend/src/schema/types/type/REPORTED.gql
@@ -2,12 +2,9 @@ type REPORTED {
   createdAt: String!
   reasonCategory: ReasonCategory!
   reasonDescription: String!
-
-  claimId: ID!
-  claimCreatedAt: String!
-  claimUpdatedAt: String!
-  claimDisable: Boolean!
-  claimClosed: Boolean!
+  claim: Claim  @cypher(
+    statement: "MATCH (resource)<-[:BELONGS_TO]-(claim:Claim)<-[:REPORTED]-(:User) WHERE NOT resource.deleted = true AND NOT resource.disabled = true RETURN claim"
+  )
 
   submitter: User
     # @cypher(statement: "MATCH (resource)<-[:REPORTED]-(user:User) RETURN user")

From 20d693b921972e5ff3b10422e0461ec340c610c9 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Mon, 25 Nov 2019 19:00:58 +0100
Subject: [PATCH 079/174] Add tests for Claim, refactor tests

---
 backend/src/schema/resolvers/reports.spec.js | 89 +++++++++++++++++++-
 1 file changed, 85 insertions(+), 4 deletions(-)

diff --git a/backend/src/schema/resolvers/reports.spec.js b/backend/src/schema/resolvers/reports.spec.js
index 0661eec4a..6f0edc9e3 100644
--- a/backend/src/schema/resolvers/reports.spec.js
+++ b/backend/src/schema/resolvers/reports.spec.js
@@ -9,7 +9,7 @@ const instance = getNeode()
 const driver = getDriver()
 
 describe('report resources', () => {
-  let authenticatedUser, currentUser, mutate, query, moderator, abusiveUser
+  let authenticatedUser, currentUser, mutate, query, moderator, abusiveUser, otherReportingUser
   const categoryIds = ['cat9']
   const reportMutation = gql`
     mutation($resourceId: ID!, $reasonCategory: ReasonCategory!, $reasonDescription: String!) {
@@ -34,6 +34,13 @@ describe('report resources', () => {
         comment {
           content
         }
+        claim {
+          id
+          createdAt
+          updatedAt
+          disable
+          closed
+        }
       }
     }
   `
@@ -81,6 +88,12 @@ describe('report resources', () => {
           email: 'test@example.org',
           password: '1234',
         })
+        otherReportingUser = await factory.create('User', {
+          id: 'other-reporting-user-id',
+          role: 'user',
+          email: 'reporting@example.org',
+          password: '1234',
+        })
         await factory.create('User', {
           id: 'abusive-user-id',
           role: 'user',
@@ -106,6 +119,46 @@ describe('report resources', () => {
       })
 
       describe('valid resource', () => {
+        describe('creates claim', () => {
+          it('which belongs to resource', async () => {
+            await expect(
+              mutate({
+                mutation: reportMutation,
+                variables: { ...variables, resourceId: 'abusive-user-id' },
+              }),
+            ).resolves.toMatchObject({
+              data: {
+                report: {
+                  type: 'User',
+                  claim: {
+                    id: expect.any(String),
+                    createdAt: expect.any(String),
+                    updatedAt: expect.any(String),
+                    disable: false,
+                    closed: false,
+                  },
+                },
+              },
+              errors: undefined,
+            })
+          })
+
+          it('creates only one claim for multiple reports on the same resource', async () => {
+            const firstReport = await mutate({
+              mutation: reportMutation,
+              variables: { ...variables, resourceId: 'abusive-user-id' },
+            })
+            authenticatedUser = await otherReportingUser.toJson()
+            const secondReport = await mutate({
+              mutation: reportMutation,
+              variables: { ...variables, resourceId: 'abusive-user-id' },
+            })
+            expect(firstReport.data.report.claim).toEqual(secondReport.data.report.claim)
+          })
+
+          it.todo('creates multiple reports')
+        })
+
         describe('reported resource is a user', () => {
           it('returns type "User"', async () => {
             await expect(
@@ -236,7 +289,7 @@ describe('report resources', () => {
             })
           })
 
-          it('sanitize the reason description', async () => {
+          it('sanitizes the reason description', async () => {
             await expect(
               mutate({
                 mutation: reportMutation,
@@ -432,13 +485,19 @@ describe('report resources', () => {
           comment {
             id
           }
+          claim {
+            id
+            createdAt
+            updatedAt
+            disable
+            closed
+          }
         }
       }
     `
 
     beforeEach(async () => {
       authenticatedUser = null
-
       moderator = await factory.create('User', {
         id: 'moderator-1',
         role: 'moderator',
@@ -519,6 +578,7 @@ describe('report resources', () => {
       ])
       authenticatedUser = null
     })
+
     describe('unauthenticated', () => {
       it('throws authorization error', async () => {
         authenticatedUser = null
@@ -528,6 +588,7 @@ describe('report resources', () => {
         })
       })
     })
+
     describe('authenticated', () => {
       it('role "user" gets no reports', async () => {
         authenticatedUser = await currentUser.toJson()
@@ -539,7 +600,6 @@ describe('report resources', () => {
 
       it('role "moderator" gets reports', async () => {
         const expected = {
-          // to check 'orderBy: createdAt_desc' is not possible here, because 'createdAt' does not differ
           reports: expect.arrayContaining([
             expect.objectContaining({
               createdAt: expect.any(String),
@@ -554,6 +614,13 @@ describe('report resources', () => {
               }),
               post: null,
               comment: null,
+              claim: {
+                id: expect.any(String),
+                createdAt: expect.any(String),
+                updatedAt: expect.any(String),
+                disable: false,
+                closed: false,
+              },
             }),
             expect.objectContaining({
               createdAt: expect.any(String),
@@ -568,6 +635,13 @@ describe('report resources', () => {
                 id: 'abusive-post-1',
               }),
               comment: null,
+              claim: {
+                id: expect.any(String),
+                createdAt: expect.any(String),
+                updatedAt: expect.any(String),
+                disable: false,
+                closed: false,
+              },
             }),
             expect.objectContaining({
               createdAt: expect.any(String),
@@ -582,6 +656,13 @@ describe('report resources', () => {
               comment: expect.objectContaining({
                 id: 'abusive-comment-1',
               }),
+              claim: {
+                id: expect.any(String),
+                createdAt: expect.any(String),
+                updatedAt: expect.any(String),
+                disable: false,
+                closed: false,
+              },
             }),
           ]),
         }

From ff404e3c3706e08628570c9cca9512cf5cb491a3 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Mon, 25 Nov 2019 19:02:58 +0100
Subject: [PATCH 080/174] Fix graphql mutation for returned Claim

---
 webapp/graphql/Moderation.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/webapp/graphql/Moderation.js b/webapp/graphql/Moderation.js
index a50e44e56..7e19241bc 100644
--- a/webapp/graphql/Moderation.js
+++ b/webapp/graphql/Moderation.js
@@ -8,11 +8,13 @@ export const reportListQuery = () => {
         createdAt
         reasonCategory
         reasonDescription
-        claimId
-        claimCreatedAt
-        claimUpdatedAt
-        claimDisable
-        claimClosed
+        claim {
+          id
+          createdAt
+          updatedAt
+          disable
+          closed
+        }
         type
         submitter {
           id

From dba23268c73481102deb3e17958b4cdeda6b8276 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 26 Nov 2019 09:20:37 +0000
Subject: [PATCH 081/174] build(deps): bump date-fns from 2.7.0 to 2.8.1 in
 /webapp

Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.7.0 to 2.8.1.
- [Release notes](https://github.com/date-fns/date-fns/releases)
- [Changelog](https://github.com/date-fns/date-fns/blob/master/CHANGELOG.md)
- [Commits](https://github.com/date-fns/date-fns/compare/v2.7.0...v2.8.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 webapp/package.json | 2 +-
 webapp/yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/webapp/package.json b/webapp/package.json
index 62ac849a5..5542b6082 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -65,7 +65,7 @@
     "cookie-universal-nuxt": "~2.0.19",
     "cropperjs": "^1.5.5",
     "cross-env": "~6.0.3",
-    "date-fns": "2.7.0",
+    "date-fns": "2.8.1",
     "express": "~4.17.1",
     "graphql": "~14.5.8",
     "jsonwebtoken": "~8.5.1",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index a426c3731..644ae6403 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -6440,10 +6440,10 @@ data-urls@^1.0.0:
     whatwg-mimetype "^2.2.0"
     whatwg-url "^7.0.0"
 
-date-fns@2.7.0:
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.7.0.tgz#8271d943cc4636a1f27698f1b8d6a9f1ceb74026"
-  integrity sha512-wxYp2PGoUDN5ZEACc61aOtYFvSsJUylIvCjpjDOqM1UDaKIIuMJ9fAnMYFHV3TQaDpfTVxhwNK/GiCaHKuemTA==
+date-fns@2.8.1:
+  version "2.8.1"
+  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.8.1.tgz#2109362ccb6c87c3ca011e9e31f702bc09e4123b"
+  integrity sha512-EL/C8IHvYRwAHYgFRse4MGAPSqlJVlOrhVYZ75iQBKrnv+ZedmYsgwH3t+BCDuZDXpoo07+q9j4qgSSOa7irJg==
 
 date-fns@^1.27.2:
   version "1.30.1"

From dcc14acf7ce6a596bc7adf773eb2761c5f3fcd40 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 26 Nov 2019 09:21:17 +0000
Subject: [PATCH 082/174] build(deps-dev): bump
 @babel/plugin-proposal-throw-expressions

Bumps [@babel/plugin-proposal-throw-expressions](https://github.com/babel/babel) from 7.2.0 to 7.7.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.2.0...v7.7.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 backend/package.json |  2 +-
 backend/yarn.lock    | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/backend/package.json b/backend/package.json
index 28f603d16..3ed144970 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -102,7 +102,7 @@
     "@babel/cli": "~7.7.0",
     "@babel/core": "~7.7.2",
     "@babel/node": "~7.7.4",
-    "@babel/plugin-proposal-throw-expressions": "^7.2.0",
+    "@babel/plugin-proposal-throw-expressions": "^7.7.4",
     "@babel/preset-env": "~7.7.4",
     "@babel/register": "~7.7.0",
     "apollo-server-testing": "~2.9.12",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 9e70b5bc7..0e70b63a2 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -364,13 +364,13 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-optional-catch-binding" "^7.7.4"
 
-"@babel/plugin-proposal-throw-expressions@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-throw-expressions/-/plugin-proposal-throw-expressions-7.2.0.tgz#2d9e452d370f139000e51db65d0a85dc60c64739"
-  integrity sha512-adsydM8DQF4i5DLNO4ySAU5VtHTPewOtNBV3u7F4lNMPADFF9bWQ+iDtUUe8+033cYCUz+bFlQdXQJmJOwoLpw==
+"@babel/plugin-proposal-throw-expressions@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-throw-expressions/-/plugin-proposal-throw-expressions-7.7.4.tgz#0321bd4acb699abef3006f7cd3d1b2c00daf1b82"
+  integrity sha512-yMcK1dM9Rv+Y5n62rKaHfRoRD4eOWIqYn4uy/Xu7C47rJKaR5JpQR905Hc/OL8EEaGNcEyuvjOtYdNAVXZKDZQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-syntax-throw-expressions" "^7.2.0"
+    "@babel/plugin-syntax-throw-expressions" "^7.7.4"
 
 "@babel/plugin-proposal-unicode-property-regex@^7.7.4":
   version "7.7.4"
@@ -415,10 +415,10 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-syntax-throw-expressions@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-throw-expressions/-/plugin-syntax-throw-expressions-7.2.0.tgz#79001ee2afe1b174b1733cdc2fc69c9a46a0f1f8"
-  integrity sha512-ngwynuqu1Rx0JUS9zxSDuPgW1K8TyVZCi2hHehrL4vyjqE7RGoNHWlZsS7KQT2vw9Yjk4YLa0+KldBXTRdPLRg==
+"@babel/plugin-syntax-throw-expressions@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-throw-expressions/-/plugin-syntax-throw-expressions-7.7.4.tgz#2e1e91485f9a35f1f71547717ccd8407a900092c"
+  integrity sha512-qtLTzzOJ1Co6tQ8pMqnsfRgeUfzExP90Tc6GISTC34O0lR6IDvymWLfVJFcJaQinz6reciQ4auALV3JM+b3D/Q==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 

From 2f249a73c5f12df7f79de89d4ce2033e4a892191 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Tue, 26 Nov 2019 15:35:48 +0100
Subject: [PATCH 083/174] Rename REPORTED Claim to FILED Report

---
 .../src/middleware/permissionsMiddleware.js   |   2 +-
 .../softDelete/softDeleteMiddleware.spec.js   |  32 +-
 .../validation/validationMiddleware.js        |  12 +-
 backend/src/models/{Claim.js => Report.js}    |   4 +-
 backend/src/models/index.js                   |   2 +-
 backend/src/schema/index.js                   |   4 +-
 backend/src/schema/resolvers/comments.js      |   2 +-
 .../{claimResource.js => reportResource.js}   |   4 +-
 backend/src/schema/resolvers/moderation.js    |  38 +-
 .../src/schema/resolvers/moderation.spec.js   |   2 +-
 backend/src/schema/resolvers/posts.js         |   2 +-
 backend/src/schema/resolvers/reports.js       |  40 +-
 backend/src/schema/resolvers/reports.spec.js  |  54 +-
 .../schema/resolvers/user_management.spec.js  |   2 +-
 backend/src/schema/resolvers/users.js         |   2 +-
 backend/src/schema/types/type/Claim.gql       |  12 -
 backend/src/schema/types/type/Comment.gql     |   4 +-
 .../types/type/{REPORTED.gql => FILED.gql}    |  14 +-
 backend/src/schema/types/type/Post.gql        |   4 +-
 backend/src/schema/types/type/REVIEWED.gql    |  10 +-
 backend/src/schema/types/type/Report.gql      |  16 +
 backend/src/schema/types/type/User.gql        |   4 +-
 backend/src/seed/factories/index.js           |   4 +-
 .../seed/factories/{claims.js => reports.js}  |   2 +-
 backend/src/seed/seed-db.js                   | 511 +++++++++++-------
 cypress/integration/common/report.js          |   2 +-
 ...nge_disabled_relationship_to_claim_node.sh |  24 +-
 .../change_report_node_to_relationship.sh     |   4 +-
 webapp/constants/modals.js                    |   2 +-
 webapp/graphql/Moderation.js                  |   4 +-
 webapp/pages/moderation/index.vue             | 153 +++---
 31 files changed, 538 insertions(+), 434 deletions(-)
 rename backend/src/models/{Claim.js => Report.js} (97%)
 rename backend/src/schema/resolvers/helpers/{claimResource.js => reportResource.js} (79%)
 delete mode 100644 backend/src/schema/types/type/Claim.gql
 rename backend/src/schema/types/type/{REPORTED.gql => FILED.gql} (55%)
 create mode 100644 backend/src/schema/types/type/Report.gql
 rename backend/src/seed/factories/{claims.js => reports.js} (68%)

diff --git a/backend/src/middleware/permissionsMiddleware.js b/backend/src/middleware/permissionsMiddleware.js
index dac3c58fa..2efa2a6bb 100644
--- a/backend/src/middleware/permissionsMiddleware.js
+++ b/backend/src/middleware/permissionsMiddleware.js
@@ -134,7 +134,7 @@ const permissions = shield(
       CreatePost: isAuthenticated,
       UpdatePost: isAuthor,
       DeletePost: isAuthor,
-      report: isAuthenticated,
+      fileReport: isAuthenticated,
       CreateSocialMedia: isAuthenticated,
       UpdateSocialMedia: isMySocialMedia,
       DeleteSocialMedia: isMySocialMedia,
diff --git a/backend/src/middleware/softDelete/softDeleteMiddleware.spec.js b/backend/src/middleware/softDelete/softDeleteMiddleware.spec.js
index 46f768384..1c97cb874 100644
--- a/backend/src/middleware/softDelete/softDeleteMiddleware.spec.js
+++ b/backend/src/middleware/softDelete/softDeleteMiddleware.spec.js
@@ -104,14 +104,14 @@ beforeAll(async () => {
   const trollingPost = resources[1]
   const trollingComment = resources[2]
 
-  const claims = await Promise.all([
-    factory.create('Claim'),
-    factory.create('Claim'),
-    factory.create('Claim'),
+  const reports = await Promise.all([
+    factory.create('Report'),
+    factory.create('Report'),
+    factory.create('Report'),
   ])
-  const claimAgainstTroll = claims[0]
-  const claimAgainstTrollingPost = claims[1]
-  const claimAgainstTrollingComment = claims[2]
+  const reportAgainstTroll = reports[0]
+  const reportAgainstTrollingPost = reports[1]
+  const reportAgainstTrollingComment = reports[2]
 
   const reportVariables = {
     resourceId: 'undefined-resource',
@@ -120,15 +120,15 @@ beforeAll(async () => {
   }
 
   await Promise.all([
-    claimAgainstTroll.relateTo(user, 'reported', { ...reportVariables, resourceId: 'u2' }),
-    claimAgainstTroll.relateTo(troll, 'belongsTo'),
-    claimAgainstTrollingPost.relateTo(user, 'reported', { ...reportVariables, resourceId: 'p2' }),
-    claimAgainstTrollingPost.relateTo(trollingPost, 'belongsTo'),
-    claimAgainstTrollingComment.relateTo(moderator, 'reported', {
+    reportAgainstTroll.relateTo(user, 'filed', { ...reportVariables, resourceId: 'u2' }),
+    reportAgainstTroll.relateTo(troll, 'belongsTo'),
+    reportAgainstTrollingPost.relateTo(user, 'filed', { ...reportVariables, resourceId: 'p2' }),
+    reportAgainstTrollingPost.relateTo(trollingPost, 'belongsTo'),
+    reportAgainstTrollingComment.relateTo(moderator, 'filed', {
       ...reportVariables,
       resourceId: 'c1',
     }),
-    claimAgainstTrollingComment.relateTo(trollingComment, 'belongsTo'),
+    reportAgainstTrollingComment.relateTo(trollingComment, 'belongsTo'),
   ])
 
   const disableVariables = {
@@ -138,14 +138,14 @@ beforeAll(async () => {
   }
 
   await Promise.all([
-    claimAgainstTroll.relateTo(moderator, 'reviewed', { ...disableVariables, resourceId: 'u2' }),
+    reportAgainstTroll.relateTo(moderator, 'reviewed', { ...disableVariables, resourceId: 'u2' }),
     troll.update({ disabled: true, updatedAt: new Date().toISOString() }),
-    claimAgainstTrollingPost.relateTo(moderator, 'reviewed', {
+    reportAgainstTrollingPost.relateTo(moderator, 'reviewed', {
       ...disableVariables,
       resourceId: 'p2',
     }),
     trollingPost.update({ disabled: true, updatedAt: new Date().toISOString() }),
-    claimAgainstTrollingComment.relateTo(moderator, 'reviewed', {
+    reportAgainstTrollingComment.relateTo(moderator, 'reviewed', {
       ...disableVariables,
       resourceId: 'c1',
     }),
diff --git a/backend/src/middleware/validation/validationMiddleware.js b/backend/src/middleware/validation/validationMiddleware.js
index 21890607b..ec761f49a 100644
--- a/backend/src/middleware/validation/validationMiddleware.js
+++ b/backend/src/middleware/validation/validationMiddleware.js
@@ -64,7 +64,7 @@ const validateReport = async (resolve, root, args, context, info) => {
   const session = driver.session()
   const reportQueryRes = await session.run(
     `
-      MATCH (:User {id: $submitterId})-[:REPORTED]->(:Claim {closed: false})-[:BELONGS_TO]->(resource {id: $resourceId}) 
+      MATCH (:User {id: $submitterId})-[:FILED]->(:Report {closed: false})-[:BELONGS_TO]->(resource {id: $resourceId}) 
       WHERE resource:User OR resource:Post OR resource:Comment
       RETURN labels(resource)[0] AS label
     `,
@@ -93,9 +93,9 @@ const validateReview = async (resolve, root, args, context, info) => {
     `
       MATCH (resource {id: $resourceId})
       WHERE resource:User OR resource:Post OR resource:Comment
-      OPTIONAL MATCH (:User)-[report:REPORTED]->(:Claim {closed: false})-[:BELONGS_TO]->(resource)
+      OPTIONAL MATCH (:User)-[filed:FILED]->(:Report {closed: false})-[:BELONGS_TO]->(resource)
       OPTIONAL MATCH (resource)<-[:WROTE]-(author:User)
-      RETURN labels(resource)[0] AS label, author, report
+      RETURN labels(resource)[0] AS label, author, filed
     `,
     {
       resourceId,
@@ -107,12 +107,12 @@ const validateReview = async (resolve, root, args, context, info) => {
     return {
       label: record.get('label'),
       author: record.get('author'),
-      report: record.get('report'),
+      filed: record.get('filed'),
     }
   })
 
   if (!existingReportedResource) throw new Error(`Resource not found!`)
-  if (!existingReportedResource.report)
+  if (!existingReportedResource.filed)
     throw new Error(
       `Before you can start the reviewing process, please report the ${existingReportedResource.label}!`,
     )
@@ -131,7 +131,7 @@ export default {
     UpdateComment: validateUpdateComment,
     CreatePost: validatePost,
     UpdatePost: validateUpdatePost,
-    report: validateReport,
+    fileReport: validateReport,
     review: validateReview,
   },
 }
diff --git a/backend/src/models/Claim.js b/backend/src/models/Report.js
similarity index 97%
rename from backend/src/models/Claim.js
rename to backend/src/models/Report.js
index ac41f9b77..b66aa4076 100644
--- a/backend/src/models/Claim.js
+++ b/backend/src/models/Report.js
@@ -13,9 +13,9 @@ module.exports = {
     target: ['User', 'Comment', 'Post'],
     direction: 'out',
   },
-  reported: {
+  filed: {
     type: 'relationship',
-    relationship: 'REPORTED',
+    relationship: 'FILED',
     target: 'User',
     direction: 'in',
     properties: {
diff --git a/backend/src/models/index.js b/backend/src/models/index.js
index 9f6868025..b94b561f0 100644
--- a/backend/src/models/index.js
+++ b/backend/src/models/index.js
@@ -13,5 +13,5 @@ export default {
   Tag: require('./Tag.js'),
   Location: require('./Location.js'),
   Donations: require('./Donations.js'),
-  Claim: require('./Claim.js'),
+  Report: require('./Report.js'),
 }
diff --git a/backend/src/schema/index.js b/backend/src/schema/index.js
index 6f58ab131..24ccbe876 100644
--- a/backend/src/schema/index.js
+++ b/backend/src/schema/index.js
@@ -18,9 +18,9 @@ export default makeAugmentedSchema({
         'Location',
         'SocialMedia',
         'NOTIFIED',
-        'REPORTED',
+        'FILED',
         'REVIEWED',
-        'Claim',
+        'Report',
         'Donations',
       ],
     },
diff --git a/backend/src/schema/resolvers/comments.js b/backend/src/schema/resolvers/comments.js
index 476e64b1b..57d4da2b9 100644
--- a/backend/src/schema/resolvers/comments.js
+++ b/backend/src/schema/resolvers/comments.js
@@ -1,6 +1,6 @@
 import uuid from 'uuid/v4'
 import Resolver from './helpers/Resolver'
-import { queryReviewedByModerator } from './helpers/claimResource.js'
+import { queryReviewedByModerator } from './helpers/reportResource.js'
 
 export default {
   Mutation: {
diff --git a/backend/src/schema/resolvers/helpers/claimResource.js b/backend/src/schema/resolvers/helpers/reportResource.js
similarity index 79%
rename from backend/src/schema/resolvers/helpers/claimResource.js
rename to backend/src/schema/resolvers/helpers/reportResource.js
index 55bc83079..ff32e4a14 100644
--- a/backend/src/schema/resolvers/helpers/claimResource.js
+++ b/backend/src/schema/resolvers/helpers/reportResource.js
@@ -2,10 +2,10 @@ export async function queryReviewedByModerator(label, parent, context) {
   if (typeof parent.reviewedByModerator !== 'undefined') return parent.reviewedByModerator
   const { id } = parent
   const statement = `
-    MATCH (resource {id: $id})<-[:BELONGS_TO]-(claim:Claim)<-[review:REVIEWED]-(moderator:User)
+    MATCH (resource {id: $id})<-[:BELONGS_TO]-(report:Report)<-[review:REVIEWED]-(moderator:User)
     WHERE $label IN labels(resource)
     RETURN moderator
-    ORDER BY claim.updatedAt DESC, review.updatedAt DESC
+    ORDER BY report.updatedAt DESC, review.updatedAt DESC
     LIMIT 1
   `
   let reviewedByModerator
diff --git a/backend/src/schema/resolvers/moderation.js b/backend/src/schema/resolvers/moderation.js
index bcb38d9eb..9d687dd42 100644
--- a/backend/src/schema/resolvers/moderation.js
+++ b/backend/src/schema/resolvers/moderation.js
@@ -16,21 +16,21 @@ export default {
             MATCH (resource {id: $resourceId})
             WHERE resource:User OR resource:Post OR resource:Comment
 
-            // no open claim, create one, update existing
-            MERGE (resource)<-[:BELONGS_TO]-(claim:Claim {closed: false})
-            ON CREATE SET claim.id = randomUUID(), claim.createdAt = $dateTime, claim.updatedAt = claim.createdAt, claim.rule = 'latestReviewUpdatedAtRules', claim.disable = resource.disabled, claim.closed = false
-            ON MATCH SET claim.updatedAt = $dateTime
-            // claim.disable and claim.closed are set after setting them in review
+            // no open report, create one, update existing
+            MERGE (resource)<-[:BELONGS_TO]-(report:Report {closed: false})
+            ON CREATE SET report.id = randomUUID(), report.createdAt = $dateTime, report.updatedAt = report.createdAt, report.rule = 'latestReviewUpdatedAtRules', report.disable = resource.disabled, report.closed = false
+            ON MATCH SET report.updatedAt = $dateTime
+            // report.disable and report.closed are set after setting them in review
 
-            // Create review on claim
-            WITH moderator, resource, claim
-            MERGE (claim)<-[review:REVIEWED]-(moderator)
+            // Create review on report
+            WITH moderator, resource, report
+            MERGE (report)<-[review:REVIEWED]-(moderator)
             ON CREATE SET review.createdAt = $dateTime, review.updatedAt = review.createdAt,
               review.disable = CASE WHEN $disable IS NULL
-                THEN claim.disable
+                THEN report.disable
                 ELSE $disable END,
               review.closed = CASE WHEN $closed IS NULL
-                THEN claim.closed
+                THEN report.closed
                 ELSE $closed END
             ON MATCH SET
               review.updatedAt = $dateTime,
@@ -41,10 +41,10 @@ export default {
                 THEN review.closed
                 ELSE $closed END
 
-            SET claim.disable = review.disable, claim.closed = review.closed
+            SET report.disable = review.disable, report.closed = review.closed
             SET resource.disabled = review.disable
 
-            RETURN moderator, review, claim, resource, labels(resource)[0] AS type
+            RETURN moderator, review, report, resource, labels(resource)[0] AS type
           `
         const mutateDecisionWriteTxResultPromise = session.writeTransaction(async txc => {
           const mutateDecisionTransactionResponse = await txc.run(cypher, {
@@ -57,21 +57,21 @@ export default {
           return mutateDecisionTransactionResponse.records.map(record => ({
             moderator: record.get('moderator'),
             review: record.get('review'),
-            claim: record.get('claim'),
+            report: record.get('report'),
             resource: record.get('resource'),
             type: record.get('type'),
           }))
         })
         const txResult = await mutateDecisionWriteTxResultPromise
         if (!txResult[0]) return null
-        const { moderator: moderatorInResult, review, claim, resource, type } = txResult[0]
+        const { moderator: moderatorInResult, review, report, resource, type } = txResult[0]
         createdRelationshipWithNestedAttributes = {
           ...review.properties,
-          claimId: claim.properties.id,
-          claimCreatedAt: claim.properties.createdAt,
-          claimUpdatedAt: claim.properties.updatedAt,
-          claimDisable: claim.properties.disable,
-          claimClosed: claim.properties.closed,
+          reportId: report.properties.id,
+          reportCreatedAt: report.properties.createdAt,
+          reportUpdatedAt: report.properties.updatedAt,
+          reportDisable: report.properties.disable,
+          reportClosed: report.properties.closed,
           moderator: moderatorInResult.properties,
           type,
           post: null,
diff --git a/backend/src/schema/resolvers/moderation.spec.js b/backend/src/schema/resolvers/moderation.spec.js
index 43e00d7fb..1c056500e 100644
--- a/backend/src/schema/resolvers/moderation.spec.js
+++ b/backend/src/schema/resolvers/moderation.spec.js
@@ -19,7 +19,7 @@ let query,
 
 const reportMutation = gql`
   mutation($resourceId: ID!, $reasonCategory: ReasonCategory!, $reasonDescription: String!) {
-    report(
+    fileReport(
       resourceId: $resourceId
       reasonCategory: $reasonCategory
       reasonDescription: $reasonDescription
diff --git a/backend/src/schema/resolvers/posts.js b/backend/src/schema/resolvers/posts.js
index f26ecc0eb..495125729 100644
--- a/backend/src/schema/resolvers/posts.js
+++ b/backend/src/schema/resolvers/posts.js
@@ -5,7 +5,7 @@ import { getBlockedUsers, getBlockedByUsers } from './users.js'
 import { mergeWith, isArray, isEmpty } from 'lodash'
 import { UserInputError } from 'apollo-server'
 import Resolver from './helpers/Resolver'
-import { queryReviewedByModerator } from './helpers/claimResource.js'
+import { queryReviewedByModerator } from './helpers/reportResource.js'
 
 const filterForBlockedUsers = async (params, context) => {
   if (!context.user) return params
diff --git a/backend/src/schema/resolvers/reports.js b/backend/src/schema/resolvers/reports.js
index f5b9b7d0e..af7bb3555 100644
--- a/backend/src/schema/resolvers/reports.js
+++ b/backend/src/schema/resolvers/reports.js
@@ -1,6 +1,6 @@
 export default {
   Mutation: {
-    report: async (_parent, params, context, _resolveInfo) => {
+    fileReport: async (_parent, params, context, _resolveInfo) => {
       let createdRelationshipWithNestedAttributes
       const { resourceId, reasonCategory, reasonDescription } = params
       const { driver, user } = context
@@ -11,15 +11,15 @@ export default {
             MATCH (submitter:User {id: $submitterId})
             MATCH (resource {id: $resourceId})
             WHERE resource:User OR resource:Post OR resource:Comment
-            // no open claim, create one
-            MERGE (resource)<-[:BELONGS_TO]-(claim:Claim {closed: false})
-            ON CREATE SET claim.id = randomUUID(), claim.createdAt = $createdAt, claim.updatedAt = claim.createdAt, claim.rule = 'latestReviewUpdatedAtRules', claim.disable = resource.disabled, claim.closed = false
-            // ON MATCH: do not update claim.updatedAt !!! that is only for reviews!
-            // Create report to claim
-            WITH submitter, resource, claim
-            CREATE (claim)<-[report:REPORTED {createdAt: $createdAt, reasonCategory: $reasonCategory, reasonDescription: $reasonDescription}]-(submitter)
+            // no open report, create one
+            MERGE (resource)<-[:BELONGS_TO]-(report:Report {closed: false})
+            ON CREATE SET report.id = randomUUID(), report.createdAt = $createdAt, report.updatedAt = report.createdAt, report.rule = 'latestReviewUpdatedAtRules', report.disable = resource.disabled, report.closed = false
+            // ON MATCH: do not update report.updatedAt !!! that is only for reviews!
+            // Create report to report
+            WITH submitter, resource, report
+            CREATE (report)<-[filed:FILED {createdAt: $createdAt, reasonCategory: $reasonCategory, reasonDescription: $reasonDescription}]-(submitter)
 
-            RETURN submitter, report, claim, resource, labels(resource)[0] AS type
+            RETURN submitter, report, filed, resource, labels(resource)[0] AS type
           `,
           {
             resourceId,
@@ -32,7 +32,7 @@ export default {
         return reportRelationshipTransactionResponse.records.map(record => ({
           submitter: record.get('submitter').properties,
           report: record.get('report').properties,
-          claim: record.get('claim').properties,
+          filed: record.get('filed').properties,
           resource: record.get('resource').properties,
           type: record.get('type'),
         }))
@@ -40,10 +40,10 @@ export default {
       try {
         const txResult = await writeTxResultPromise
         if (!txResult[0]) return null
-        const { submitter, report, claim, resource, type } = txResult[0]
+        const { submitter, report, filed, resource, type } = txResult[0]
         createdRelationshipWithNestedAttributes = {
-          ...report,
-          claim,
+          ...filed,
+          report,
           post: null,
           comment: null,
           user: null,
@@ -74,10 +74,10 @@ export default {
       let reports, orderByClause
       switch (params.orderBy) {
         case 'createdAt_asc':
-          orderByClause = 'ORDER BY claim.createdAt ASC, report.createdAt DESC'
+          orderByClause = 'ORDER BY report.createdAt ASC, filed.createdAt DESC'
           break
         case 'createdAt_desc':
-          orderByClause = 'ORDER BY claim.createdAt DESC, report.createdAt DESC'
+          orderByClause = 'ORDER BY report.createdAt DESC, filed.createdAt DESC'
           break
         default:
           orderByClause = ''
@@ -85,9 +85,9 @@ export default {
       const readTxPromise = session.readTransaction(async tx => {
         const allReportsTransactionResponse = await tx.run(
           `
-          MATCH (submitter:User)-[report:REPORTED]->(claim:Claim)-[:BELONGS_TO]->(resource)
+          MATCH (submitter:User)-[filed:FILED]->(report:Report)-[:BELONGS_TO]->(resource)
           WHERE resource:User OR resource:Post OR resource:Comment
-          RETURN submitter, report, claim, resource, labels(resource)[0] as type
+          RETURN submitter, report, filed, resource, labels(resource)[0] as type
           ${orderByClause}
           `,
           {},
@@ -95,7 +95,7 @@ export default {
         return allReportsTransactionResponse.records.map(record => ({
           submitter: record.get('submitter').properties,
           report: record.get('report').properties,
-          claim: record.get('claim').properties,
+          filed: record.get('filed').properties,
           resource: record.get('resource').properties,
           type: record.get('type'),
         }))
@@ -104,10 +104,10 @@ export default {
         const txResult = await readTxPromise
         if (!txResult[0]) return null
         reports = txResult.map(reportedRecord => {
-          const { report, submitter, claim, resource, type } = reportedRecord
+          const { report, submitter, filed, resource, type } = reportedRecord
           const relationshipWithNestedAttributes = {
             ...report,
-            claim,
+            filed,
             post: null,
             comment: null,
             user: null,
diff --git a/backend/src/schema/resolvers/reports.spec.js b/backend/src/schema/resolvers/reports.spec.js
index 6f0edc9e3..adf9048f0 100644
--- a/backend/src/schema/resolvers/reports.spec.js
+++ b/backend/src/schema/resolvers/reports.spec.js
@@ -8,12 +8,12 @@ const factory = Factory()
 const instance = getNeode()
 const driver = getDriver()
 
-describe('report resources', () => {
+describe('file a report on a resource', () => {
   let authenticatedUser, currentUser, mutate, query, moderator, abusiveUser, otherReportingUser
   const categoryIds = ['cat9']
   const reportMutation = gql`
     mutation($resourceId: ID!, $reasonCategory: ReasonCategory!, $reasonDescription: String!) {
-      report(
+      fileReport(
         resourceId: $resourceId
         reasonCategory: $reasonCategory
         reasonDescription: $reasonDescription
@@ -34,7 +34,7 @@ describe('report resources', () => {
         comment {
           content
         }
-        claim {
+        report {
           id
           createdAt
           updatedAt
@@ -74,7 +74,7 @@ describe('report resources', () => {
       it('throws authorization error', async () => {
         authenticatedUser = null
         await expect(mutate({ mutation: reportMutation, variables })).resolves.toMatchObject({
-          data: { report: null },
+          data: { fileReport: null },
           errors: [{ message: 'Not Authorised!' }],
         })
       })
@@ -112,14 +112,14 @@ describe('report resources', () => {
       describe('invalid resource id', () => {
         it('returns null', async () => {
           await expect(mutate({ mutation: reportMutation, variables })).resolves.toMatchObject({
-            data: { report: null },
+            data: { fileReport: null },
             errors: undefined,
           })
         })
       })
 
       describe('valid resource', () => {
-        describe('creates claim', () => {
+        describe('creates report', () => {
           it('which belongs to resource', async () => {
             await expect(
               mutate({
@@ -128,9 +128,9 @@ describe('report resources', () => {
               }),
             ).resolves.toMatchObject({
               data: {
-                report: {
+                fileReport: {
                   type: 'User',
-                  claim: {
+                  report: {
                     id: expect.any(String),
                     createdAt: expect.any(String),
                     updatedAt: expect.any(String),
@@ -143,7 +143,7 @@ describe('report resources', () => {
             })
           })
 
-          it('creates only one claim for multiple reports on the same resource', async () => {
+          it('creates only one report for multiple reports on the same resource', async () => {
             const firstReport = await mutate({
               mutation: reportMutation,
               variables: { ...variables, resourceId: 'abusive-user-id' },
@@ -153,7 +153,7 @@ describe('report resources', () => {
               mutation: reportMutation,
               variables: { ...variables, resourceId: 'abusive-user-id' },
             })
-            expect(firstReport.data.report.claim).toEqual(secondReport.data.report.claim)
+            expect(firstReport.data.fileReport.report).toEqual(secondReport.data.fileReport.report)
           })
 
           it.todo('creates multiple reports')
@@ -168,7 +168,7 @@ describe('report resources', () => {
               }),
             ).resolves.toMatchObject({
               data: {
-                report: {
+                fileReport: {
                   type: 'User',
                 },
               },
@@ -184,7 +184,7 @@ describe('report resources', () => {
               }),
             ).resolves.toMatchObject({
               data: {
-                report: {
+                fileReport: {
                   user: {
                     name: 'abusive-user',
                   },
@@ -202,7 +202,7 @@ describe('report resources', () => {
               }),
             ).resolves.toMatchObject({
               data: {
-                report: {
+                fileReport: {
                   submitter: {
                     email: 'test@example.org',
                   },
@@ -220,7 +220,7 @@ describe('report resources', () => {
               }),
             ).resolves.toMatchObject({
               data: {
-                report: {
+                fileReport: {
                   createdAt: expect.any(String),
                 },
               },
@@ -240,7 +240,7 @@ describe('report resources', () => {
               }),
             ).resolves.toMatchObject({
               data: {
-                report: {
+                fileReport: {
                   reasonCategory: 'criminal_behavior_violation_german_law',
                 },
               },
@@ -281,7 +281,7 @@ describe('report resources', () => {
               }),
             ).resolves.toMatchObject({
               data: {
-                report: {
+                fileReport: {
                   reasonDescription: 'My reason!',
                 },
               },
@@ -301,7 +301,7 @@ describe('report resources', () => {
               }),
             ).resolves.toMatchObject({
               data: {
-                report: {
+                fileReport: {
                   reasonDescription: 'My reason !',
                 },
               },
@@ -331,7 +331,7 @@ describe('report resources', () => {
               }),
             ).resolves.toMatchObject({
               data: {
-                report: {
+                fileReport: {
                   type: 'Post',
                 },
               },
@@ -350,7 +350,7 @@ describe('report resources', () => {
               }),
             ).resolves.toMatchObject({
               data: {
-                report: {
+                fileReport: {
                   post: {
                     title: 'This is a post that is going to be reported',
                   },
@@ -371,7 +371,7 @@ describe('report resources', () => {
               }),
             ).resolves.toMatchObject({
               data: {
-                report: {
+                fileReport: {
                   user: null,
                 },
               },
@@ -409,7 +409,7 @@ describe('report resources', () => {
               }),
             ).resolves.toMatchObject({
               data: {
-                report: {
+                fileReport: {
                   type: 'Comment',
                 },
               },
@@ -428,7 +428,7 @@ describe('report resources', () => {
               }),
             ).resolves.toMatchObject({
               data: {
-                report: {
+                fileReport: {
                   comment: {
                     content: 'Post comment to be reported.',
                   },
@@ -456,7 +456,7 @@ describe('report resources', () => {
                 },
               }),
             ).resolves.toMatchObject({
-              data: { report: null },
+              data: { fileReport: null },
               errors: undefined,
             })
           })
@@ -485,7 +485,7 @@ describe('report resources', () => {
           comment {
             id
           }
-          claim {
+          report {
             id
             createdAt
             updatedAt
@@ -614,7 +614,7 @@ describe('report resources', () => {
               }),
               post: null,
               comment: null,
-              claim: {
+              report: {
                 id: expect.any(String),
                 createdAt: expect.any(String),
                 updatedAt: expect.any(String),
@@ -635,7 +635,7 @@ describe('report resources', () => {
                 id: 'abusive-post-1',
               }),
               comment: null,
-              claim: {
+              report: {
                 id: expect.any(String),
                 createdAt: expect.any(String),
                 updatedAt: expect.any(String),
@@ -656,7 +656,7 @@ describe('report resources', () => {
               comment: expect.objectContaining({
                 id: 'abusive-comment-1',
               }),
-              claim: {
+              report: {
                 id: expect.any(String),
                 createdAt: expect.any(String),
                 updatedAt: expect.any(String),
diff --git a/backend/src/schema/resolvers/user_management.spec.js b/backend/src/schema/resolvers/user_management.spec.js
index d88583ebb..fc7e21e6f 100644
--- a/backend/src/schema/resolvers/user_management.spec.js
+++ b/backend/src/schema/resolvers/user_management.spec.js
@@ -22,7 +22,7 @@ const disable = async id => {
   await mutate({
     mutation: gql`
       mutation($resourceId: ID!, $reasonCategory: ReasonCategory!, $reasonDescription: String!) {
-        report(
+        fileReport(
           resourceId: $resourceId
           reasonCategory: $reasonCategory
           reasonDescription: $reasonDescription
diff --git a/backend/src/schema/resolvers/users.js b/backend/src/schema/resolvers/users.js
index 2a43a215f..7a9a1f0bc 100644
--- a/backend/src/schema/resolvers/users.js
+++ b/backend/src/schema/resolvers/users.js
@@ -3,7 +3,7 @@ import fileUpload from './fileUpload'
 import { neode } from '../../bootstrap/neo4j'
 import { UserInputError, ForbiddenError } from 'apollo-server'
 import Resolver from './helpers/Resolver'
-import { queryReviewedByModerator } from './helpers/claimResource.js'
+import { queryReviewedByModerator } from './helpers/reportResource.js'
 
 const instance = neode()
 
diff --git a/backend/src/schema/types/type/Claim.gql b/backend/src/schema/types/type/Claim.gql
deleted file mode 100644
index 23e052308..000000000
--- a/backend/src/schema/types/type/Claim.gql
+++ /dev/null
@@ -1,12 +0,0 @@
-type Claim {
-  id: ID!
-  createdAt: String!
-  updatedAt: String!
-  rule: ClaimRule!
-  disable: Boolean!
-  closed: Boolean!
-}
-
-enum ClaimRule {
-  latestReviewUpdatedAtRules
-}
diff --git a/backend/src/schema/types/type/Comment.gql b/backend/src/schema/types/type/Comment.gql
index b14c9c600..23ab3aae0 100644
--- a/backend/src/schema/types/type/Comment.gql
+++ b/backend/src/schema/types/type/Comment.gql
@@ -50,9 +50,9 @@ type Comment {
   reviewedByModerator: User
     @cypher(
       statement: """
-        MATCH (this)<-[:BELONGS_TO]-(claim:Claim)<-[review:REVIEWED]-(moderator:User)
+        MATCH (this)<-[:BELONGS_TO]-(report:Report)<-[review:REVIEWED]-(moderator:User)
         RETURN moderator
-        ORDER BY claim.updatedAt DESC, review.updatedAt DESC
+        ORDER BY report.updatedAt DESC, review.updatedAt DESC
         LIMIT 1
       """
     )
diff --git a/backend/src/schema/types/type/REPORTED.gql b/backend/src/schema/types/type/FILED.gql
similarity index 55%
rename from backend/src/schema/types/type/REPORTED.gql
rename to backend/src/schema/types/type/FILED.gql
index f610a657c..326188660 100644
--- a/backend/src/schema/types/type/REPORTED.gql
+++ b/backend/src/schema/types/type/FILED.gql
@@ -1,15 +1,15 @@
-type REPORTED {
+type FILED {
   createdAt: String!
   reasonCategory: ReasonCategory!
   reasonDescription: String!
-  claim: Claim  @cypher(
-    statement: "MATCH (resource)<-[:BELONGS_TO]-(claim:Claim)<-[:REPORTED]-(:User) WHERE NOT resource.deleted = true AND NOT resource.disabled = true RETURN claim"
+  report: Report  @cypher(
+    statement: "MATCH (resource)<-[:BELONGS_TO]-(report:Report)<-[:FILED]-(:User) WHERE NOT resource.deleted = true AND NOT resource.disabled = true RETURN report"
   )
 
   submitter: User
-    # @cypher(statement: "MATCH (resource)<-[:REPORTED]-(user:User) RETURN user")
+    # @cypher(statement: "MATCH (resource)<-[:FILED]-(user:User) RETURN user")
   type: String
-    # @cypher(statement: "MATCH (resource)<-[:REPORTED]-(user:User) RETURN labels(resource)[0]")
+    # @cypher(statement: "MATCH (resource)<-[:FILED]-(user:User) RETURN labels(resource)[0]")
   user: User
   post: Post
   comment: Comment
@@ -36,9 +36,9 @@ enum ReportOrdering {
 }
 
 type Query {
-  reports(orderBy: ReportOrdering): [REPORTED]
+  reports(orderBy: ReportOrdering): [FILED]
 }
 
 type Mutation {
-  report(resourceId: ID!, reasonCategory: ReasonCategory!, reasonDescription: String!): REPORTED
+  fileReport(resourceId: ID!, reasonCategory: ReasonCategory!, reasonDescription: String!): FILED
 }
diff --git a/backend/src/schema/types/type/Post.gql b/backend/src/schema/types/type/Post.gql
index dfcb7a0fc..eb6ab845a 100644
--- a/backend/src/schema/types/type/Post.gql
+++ b/backend/src/schema/types/type/Post.gql
@@ -124,9 +124,9 @@ type Post {
   reviewedByModerator: User
     @cypher(
       statement: """
-        MATCH (this)<-[:BELONGS_TO]-(claim:Claim)<-[review:REVIEWED]-(moderator:User)
+        MATCH (this)<-[:BELONGS_TO]-(report:Report)<-[review:REVIEWED]-(moderator:User)
         RETURN moderator
-        ORDER BY claim.updatedAt DESC, review.updatedAt DESC
+        ORDER BY report.updatedAt DESC, review.updatedAt DESC
         LIMIT 1
       """
     )
diff --git a/backend/src/schema/types/type/REVIEWED.gql b/backend/src/schema/types/type/REVIEWED.gql
index 3babae152..c296483ea 100644
--- a/backend/src/schema/types/type/REVIEWED.gql
+++ b/backend/src/schema/types/type/REVIEWED.gql
@@ -6,11 +6,11 @@ type REVIEWED {
   disable: Boolean!
   closed: Boolean!
 
-  claimId: ID!
-  claimCreatedAt: String!
-  claimUpdatedAt: String!
-  claimDisable: Boolean!
-  claimClosed: Boolean!
+  reportId: ID!
+  reportCreatedAt: String!
+  reportUpdatedAt: String!
+  reportDisable: Boolean!
+  reportClosed: Boolean!
   
   moderator: User
   type: String
diff --git a/backend/src/schema/types/type/Report.gql b/backend/src/schema/types/type/Report.gql
new file mode 100644
index 000000000..8bbbf096c
--- /dev/null
+++ b/backend/src/schema/types/type/Report.gql
@@ -0,0 +1,16 @@
+type Report {
+  id: ID!
+  createdAt: String!
+  updatedAt: String!
+  rule: ReportRule!
+  disable: Boolean!
+  closed: Boolean!
+  resource: ReportResource
+  filed: [FILED]
+}
+# not yet supported
+union ReportResource = User | Post | Comment
+
+enum ReportRule {
+  latestReviewUpdatedAtRules
+}
diff --git a/backend/src/schema/types/type/User.gql b/backend/src/schema/types/type/User.gql
index 13f9d0cd3..499718e21 100644
--- a/backend/src/schema/types/type/User.gql
+++ b/backend/src/schema/types/type/User.gql
@@ -36,9 +36,9 @@ type User {
   reviewedByModerator: User
     @cypher(
       statement: """
-        MATCH (this)<-[:BELONGS_TO]-(claim:Claim)<-[review:REVIEWED]-(moderator:User)
+        MATCH (this)<-[:BELONGS_TO]-(report:Report)<-[review:REVIEWED]-(moderator:User)
         RETURN moderator
-        ORDER BY claim.updatedAt DESC, review.updatedAt DESC
+        ORDER BY report.updatedAt DESC, review.updatedAt DESC
         LIMIT 1
       """
     )
diff --git a/backend/src/seed/factories/index.js b/backend/src/seed/factories/index.js
index 27ec83621..606f569f4 100644
--- a/backend/src/seed/factories/index.js
+++ b/backend/src/seed/factories/index.js
@@ -10,7 +10,7 @@ import createLocation from './locations.js'
 import createEmailAddress from './emailAddresses.js'
 import createDonations from './donations.js'
 import createUnverifiedEmailAddresss from './unverifiedEmailAddresses.js'
-import createClaim from './claims.js'
+import createReport from './reports.js'
 
 const factories = {
   Badge: createBadge,
@@ -24,7 +24,7 @@ const factories = {
   EmailAddress: createEmailAddress,
   UnverifiedEmailAddress: createUnverifiedEmailAddresss,
   Donations: createDonations,
-  Claim: createClaim,
+  Report: createReport,
 }
 
 export const cleanDatabase = async (options = {}) => {
diff --git a/backend/src/seed/factories/claims.js b/backend/src/seed/factories/reports.js
similarity index 68%
rename from backend/src/seed/factories/claims.js
rename to backend/src/seed/factories/reports.js
index 0c18da783..e2d5ec4dc 100644
--- a/backend/src/seed/factories/claims.js
+++ b/backend/src/seed/factories/reports.js
@@ -1,7 +1,7 @@
 export default function create() {
   return {
     factory: async ({ args, neodeInstance }) => {
-      return neodeInstance.create('Claim', args)
+      return neodeInstance.create('Report', args)
     },
   }
 }
diff --git a/backend/src/seed/seed-db.js b/backend/src/seed/seed-db.js
index 6c0674d73..cf701f89b 100644
--- a/backend/src/seed/seed-db.js
+++ b/backend/src/seed/seed-db.js
@@ -524,7 +524,7 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
     ])
     authenticatedUser = null
 
-    await Promise.all([
+    const comments = await Promise.all([
       factory.create('Comment', {
         author: jennyRostock,
         id: 'c1',
@@ -581,6 +581,7 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
         postId: 'p15',
       }),
     ])
+    const trollingComment = comments[0]
 
     await Promise.all([
       democracy.relateTo(p3, 'post'),
@@ -644,236 +645,334 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
       louie.relateTo(p10, 'shouted'),
     ])
 
-    // There is no error logged or the 'try' fails if this mutation is wrong. Why?
-    const reportMutation = gql`
-      mutation($resourceId: ID!, $reasonCategory: ReasonCategory!, $reasonDescription: String!) {
-        report(
-          resourceId: $resourceId
-          reasonCategory: $reasonCategory
-          reasonDescription: $reasonDescription
-        ) {
-          type
-        }
-      }
-    `
-    authenticatedUser = await huey.toJson()
+    const reports = await Promise.all([
+      factory.create('Report'),
+      factory.create('Report'),
+      factory.create('Report'),
+    ])
+    const reportAgainstDagobert = reports[0]
+    const reportAgainstTrollingPost = reports[1]
+    const reportAgainstTrollingComment = reports[2]
+
     // report resource first time
     await Promise.all([
-      mutate({
-        mutation: reportMutation,
-        variables: {
-          resourceId: 'p11',
-          reasonCategory: 'discrimination_etc',
-          reasonDescription: 'I am what I am !!!',
-        },
+      reportAgainstDagobert.relateTo(jennyRostock, 'filed', {
+        resourceId: 'u7',
+        reasonCategory: 'discrimination_etc',
+        reasonDescription: 'This user is harassing me with bigoted remarks!',
       }),
-      mutate({
-        mutation: reportMutation,
-        variables: {
-          resourceId: 'c5',
-          reasonCategory: 'doxing',
-          reasonDescription: "This shouldn't be shown to anybody else! It's my privat thing!",
-        },
+      reportAgainstDagobert.relateTo(dagobert, 'belongsTo'),
+      reportAgainstTrollingPost.relateTo(jennyRostock, 'filed', {
+        resourceId: 'p2',
+        reasonCategory: 'doxing',
+        reasonDescription: "This shouldn't be shown to anybody else! It's my private thing!",
       }),
-      mutate({
-        mutation: reportMutation,
-        variables: {
-          resourceId: 'c1',
-          reasonCategory: 'other',
-          reasonDescription: 'This comment is bigoted',
-        },
-      }),
-      mutate({
-        mutation: reportMutation,
-        variables: {
-          resourceId: 'p1',
-          reasonCategory: 'discrimination_etc',
-          reasonDescription: 'This post is bigoted',
-        },
-      }),
-      mutate({
-        mutation: reportMutation,
-        variables: {
-          resourceId: 'p2',
-          reasonCategory: 'doxing',
-          reasonDescription: 'OMG my data !!!',
-        },
-      }),
-      mutate({
-        mutation: reportMutation,
-        variables: {
-          resourceId: 'u1',
-          reasonCategory: 'doxing',
-          reasonDescription: 'This user is harassing me with bigoted remarks',
-        },
+      reportAgainstTrollingPost.relateTo(p2, 'belongsTo'),
+      reportAgainstTrollingComment.relateTo(huey, 'filed', {
+        resourceId: 'c1',
+        reasonCategory: 'other',
+        reasonDescription: 'This comment is bigoted',
       }),
+      reportAgainstTrollingComment.relateTo(trollingComment, 'belongsTo'),
+    ])
+
+    // report resource a second time
+    await Promise.all([
+      reportAgainstDagobert.relateTo(louie, 'filed', {
+        resourceId: 'u7',
+        reasonCategory: 'discrimination_etc',
+        reasonDescription: 'this user is attacking me for who I am!',
+      }),
+      reportAgainstDagobert.relateTo(dagobert, 'belongsTo'),
+      reportAgainstTrollingPost.relateTo(peterLustig, 'filed', {
+        resourceId: 'p2',
+        reasonCategory: 'discrimination_etc',
+        reasonDescription: 'This post is bigoted',
+      }),
+      reportAgainstTrollingPost.relateTo(p2, 'belongsTo'),
+
+      reportAgainstTrollingComment.relateTo(bobDerBaumeister, 'filed', {
+        resourceId: 'c1',
+        reasonCategory: 'pornographic_content_links',
+        reasonDescription: 'This comment is porno!!!',
+      }),
+      reportAgainstTrollingComment.relateTo(trollingComment, 'belongsTo'),
     ])
-    // report resource a second time
-    authenticatedUser = await dewey.toJson()
-    await Promise.all([
-      mutate({
-        mutation: reportMutation,
-        variables: {
-          resourceId: 'c5',
-          reasonCategory: 'doxing',
-          reasonDescription: "That's my friends privat data!",
-        },
-      }),
-      mutate({
-        mutation: reportMutation,
-        variables: {
-          resourceId: 'c1',
-          reasonCategory: 'pornographic_content_links',
-          reasonDescription: 'This comment is porno!!!',
-        },
-      }),
-      mutate({
-        mutation: reportMutation,
-        variables: {
-          resourceId: 'p1',
-          reasonCategory: 'intentional_intimidation_stalking_persecution',
-          reasonDescription: '',
-        },
-      }),
-      mutate({
-        mutation: reportMutation,
-        variables: {
-          resourceId: 'p2',
-          reasonCategory: 'intentional_intimidation_stalking_persecution',
-          reasonDescription: '',
-        },
-      }),
-      mutate({
-        mutation: reportMutation,
-        variables: {
-          resourceId: 'u1',
-          reasonCategory: 'glorific_trivia_of_cruel_inhuman_acts',
-          reasonDescription: 'murder',
-        },
-      }),
-    ])
-    authenticatedUser = null
 
-    // only review resource after report !!!
-    const reviewMutation = gql`
-      mutation($resourceId: ID!, $disable: Boolean, $closed: Boolean) {
-        review(resourceId: $resourceId, disable: $disable, closed: $closed) {
-          disable
-        }
-      }
-    `
     const disableVariables = {
       resourceId: 'undefined-resource',
       disable: true,
       closed: false,
     }
+
     // review resource first time
-    authenticatedUser = await bobDerBaumeister.toJson()
     await Promise.all([
-      mutate({
-        mutation: reviewMutation,
-        variables: {
-          ...disableVariables,
-          resourceId: 'p2',
-        },
+      reportAgainstDagobert.relateTo(bobDerBaumeister, 'reviewed', {
+        ...disableVariables,
+        resourceId: 'u7',
       }),
-      mutate({
-        mutation: reviewMutation,
-        variables: {
-          ...disableVariables,
-          resourceId: 'p11',
-        },
+      dagobert.update({ disabled: true, updatedAt: new Date().toISOString() }),
+      reportAgainstTrollingPost.relateTo(peterLustig, 'reviewed', {
+        ...disableVariables,
+        resourceId: 'p2',
       }),
-      mutate({
-        mutation: reviewMutation,
-        variables: {
-          ...disableVariables,
-          resourceId: 'c5',
-          closed: true,
-        },
+      p2.update({ disabled: true, updatedAt: new Date().toISOString() }),
+      reportAgainstTrollingComment.relateTo(bobDerBaumeister, 'reviewed', {
+        ...disableVariables,
+        resourceId: 'c1',
       }),
+      trollingComment.update({ disabled: true, updatedAt: new Date().toISOString() }),
     ])
-    // second review of resource and close claim
-    authenticatedUser = await peterLustig.toJson()
-    await Promise.all([
-      mutate({
-        mutation: reviewMutation,
-        variables: {
-          ...disableVariables,
-          resourceId: 'p2',
-          disable: false,
-          closed: true,
-        },
-      }),
-    ])
-    authenticatedUser = null
 
-    // report resource after closing of the claim
-    authenticatedUser = await bobDerBaumeister.toJson()
+    // second review of resource and close report
     await Promise.all([
-      mutate({
-        mutation: reportMutation,
-        variables: {
-          resourceId: 'p2',
-          reasonCategory: 'doxing',
-          reasonDescription: "That's my friends privat data!",
-        },
+      reportAgainstDagobert.relateTo(peterLustig, 'reviewed', {
+        resourceId: 'u7',
+        disable: false,
+        closed: true,
       }),
-    ])
-    // report resource second time after closing of the claim
-    authenticatedUser = await jennyRostock.toJson()
-    await Promise.all([
-      mutate({
-        mutation: reportMutation,
-        variables: {
-          resourceId: 'p2',
-          reasonCategory: 'doxing',
-          reasonDescription: 'I think it is my friends data!',
-        },
+      dagobert.update({ disabled: false, updatedAt: new Date().toISOString(), closed: true }),
+      reportAgainstTrollingPost.relateTo(bobDerBaumeister, 'reviewed', {
+        resourceId: 'p2',
+        disable: true,
+        closed: true,
       }),
+      p2.update({ disabled: true, updatedAt: new Date().toISOString(), closed: true }),
+      reportAgainstTrollingComment.relateTo(peterLustig, 'reviewed', {
+        ...disableVariables,
+        resourceId: 'c1',
+        disable: true,
+        closed: true,
+      }),
+      trollingComment.update({ disabled: true, updatedAt: new Date().toISOString(), closed: true }),
     ])
-    authenticatedUser = null
 
-    // third review of resource and close claim
-    authenticatedUser = await bobDerBaumeister.toJson()
-    await Promise.all([
-      mutate({
-        mutation: reviewMutation,
-        variables: {
-          ...disableVariables,
-          resourceId: 'p2',
-          disable: true,
-          closed: true,
-        },
-      }),
-    ])
-    authenticatedUser = null
+    // There is no error logged or the 'try' fails if this mutation is wrong. Why?
+    // const reportMutation = gql`
+    //   mutation($resourceId: ID!, $reasonCategory: ReasonCategory!, $reasonDescription: String!) {
+    //     report(
+    //       resourceId: $resourceId
+    //       reasonCategory: $reasonCategory
+    //       reasonDescription: $reasonDescription
+    //     ) {
+    //       type
+    //     }
+    //   }
+    // `
+    // authenticatedUser = await huey.toJson()
+    // await Promise.all([
+    //   mutate({
+    //     mutation: reportMutation,
+    //     variables: {
+    //       resourceId: 'p11',
+    //       reasonCategory: 'discrimination_etc',
+    //       reasonDescription: 'I am what I am !!!',
+    //     },
+    //   }),
+    //   mutate({
+    //     mutation: reportMutation,
+    //     variables: {
+    //       resourceId: 'c5',
+    //       reasonCategory: 'doxing',
+    //       reasonDescription: "This shouldn't be shown to anybody else! It's my privat thing!",
+    //     },
+    //   }),
+    //   mutate({
+    //     mutation: reportMutation,
+    //     variables: {
+    //       resourceId: 'c1',
+    //       reasonCategory: 'other',
+    //       reasonDescription: 'This comment is bigoted',
+    //     },
+    //   }),
+    //   mutate({
+    //     mutation: reportMutation,
+    //     variables: {
+    //       resourceId: 'p1',
+    //       reasonCategory: 'discrimination_etc',
+    //       reasonDescription: 'This post is bigoted',
+    //     },
+    //   }),
+    //   mutate({
+    //     mutation: reportMutation,
+    //     variables: {
+    //       resourceId: 'p2',
+    //       reasonCategory: 'doxing',
+    //       reasonDescription: 'OMG my data !!!',
+    //     },
+    //   }),
+    //   mutate({
+    //     mutation: reportMutation,
+    //     variables: {
+    //       resourceId: 'u1',
+    //       reasonCategory: 'doxing',
+    //       reasonDescription: 'This user is harassing me with bigoted remarks',
+    //     },
+    //   }),
+    // ])
+    // authenticatedUser = await dewey.toJson()
+    // await Promise.all([
+    //   mutate({
+    //     mutation: reportMutation,
+    //     variables: {
+    //       resourceId: 'c5',
+    //       reasonCategory: 'doxing',
+    //       reasonDescription: "That's my friends privat data!",
+    //     },
+    //   }),
+    //   mutate({
+    //     mutation: reportMutation,
+    //     variables: {
+    //       resourceId: 'c1',
+    //       reasonCategory: 'pornographic_content_links',
+    //       reasonDescription: 'This comment is porno!!!',
+    //     },
+    //   }),
+    //   mutate({
+    //     mutation: reportMutation,
+    //     variables: {
+    //       resourceId: 'p1',
+    //       reasonCategory: 'intentional_intimidation_stalking_persecution',
+    //       reasonDescription: '',
+    //     },
+    //   }),
+    //   mutate({
+    //     mutation: reportMutation,
+    //     variables: {
+    //       resourceId: 'p2',
+    //       reasonCategory: 'intentional_intimidation_stalking_persecution',
+    //       reasonDescription: '',
+    //     },
+    //   }),
+    //   mutate({
+    //     mutation: reportMutation,
+    //     variables: {
+    //       resourceId: 'u1',
+    //       reasonCategory: 'glorific_trivia_of_cruel_inhuman_acts',
+    //       reasonDescription: 'murder',
+    //     },
+    //   }),
+    // ])
+    // authenticatedUser = null
 
-    // report resource after second closing of the claim
-    authenticatedUser = await huey.toJson()
-    await Promise.all([
-      mutate({
-        mutation: reportMutation,
-        variables: {
-          resourceId: 'p2',
-          reasonCategory: 'doxing',
-          reasonDescription: "That's my privat data!",
-        },
-      }),
-    ])
-    // report resource second time after second closing of the claim
-    authenticatedUser = await jennyRostock.toJson()
-    await Promise.all([
-      mutate({
-        mutation: reportMutation,
-        variables: {
-          resourceId: 'p2',
-          reasonCategory: 'doxing',
-          reasonDescription: 'I think it is my friends data again!',
-        },
-      }),
-    ])
-    authenticatedUser = null
+    // only review resource after report !!!
+    // const reviewMutation = gql`
+    //   mutation($resourceId: ID!, $disable: Boolean, $closed: Boolean) {
+    //     review(resourceId: $resourceId, disable: $disable, closed: $closed) {
+    //       disable
+    //     }
+    //   }
+    // `
+    // const disableVariables = {
+    //   resourceId: 'undefined-resource',
+    //   disable: true,
+    //   closed: false,
+    // }
+    // authenticatedUser = await bobDerBaumeister.toJson()
+    // await Promise.all([
+    //   mutate({
+    //     mutation: reviewMutation,
+    //     variables: {
+    //       ...disableVariables,
+    //       resourceId: 'p2',
+    //     },
+    //   }),
+    //   mutate({
+    //     mutation: reviewMutation,
+    //     variables: {
+    //       ...disableVariables,
+    //       resourceId: 'p11',
+    //     },
+    //   }),
+    //   mutate({
+    //     mutation: reviewMutation,
+    //     variables: {
+    //       ...disableVariables,
+    //       resourceId: 'c5',
+    //       closed: true,
+    //     },
+    //   }),
+    // ])
+    // authenticatedUser = await peterLustig.toJson()
+    // await Promise.all([
+    //   mutate({
+    //     mutation: reviewMutation,
+    //     variables: {
+    //       ...disableVariables,
+    //       resourceId: 'p2',
+    //       disable: false,
+    //       closed: true,
+    //     },
+    //   }),
+    // ])
+    // authenticatedUser = null
+
+    // report resource after closing of the report
+    // authenticatedUser = await bobDerBaumeister.toJson()
+    // await Promise.all([
+    //   mutate({
+    //     mutation: reportMutation,
+    //     variables: {
+    //       resourceId: 'p2',
+    //       reasonCategory: 'doxing',
+    //       reasonDescription: "That's my friends privat data!",
+    //     },
+    //   }),
+    // ])
+    // // report resource second time after closing of the report
+    // authenticatedUser = await jennyRostock.toJson()
+    // await Promise.all([
+    //   mutate({
+    //     mutation: reportMutation,
+    //     variables: {
+    //       resourceId: 'p2',
+    //       reasonCategory: 'doxing',
+    //       reasonDescription: 'I think it is my friends data!',
+    //     },
+    //   }),
+    // ])
+    // authenticatedUser = null
+
+    // // third review of resource and close report
+    // authenticatedUser = await bobDerBaumeister.toJson()
+    // await Promise.all([
+    //   mutate({
+    //     mutation: reviewMutation,
+    //     variables: {
+    //       ...disableVariables,
+    //       resourceId: 'p2',
+    //       disable: true,
+    //       closed: true,
+    //     },
+    //   }),
+    // ])
+    // authenticatedUser = null
+
+    // // report resource after second closing of the report
+    // authenticatedUser = await huey.toJson()
+    // await Promise.all([
+    //   mutate({
+    //     mutation: reportMutation,
+    //     variables: {
+    //       resourceId: 'p2',
+    //       reasonCategory: 'doxing',
+    //       reasonDescription: "That's my privat data!",
+    //     },
+    //   }),
+    // ])
+    // // report resource second time after second closing of the report
+    // authenticatedUser = await jennyRostock.toJson()
+    // await Promise.all([
+    //   mutate({
+    //     mutation: reportMutation,
+    //     variables: {
+    //       resourceId: 'p2',
+    //       reasonCategory: 'doxing',
+    //       reasonDescription: 'I think it is my friends data again!',
+    //     },
+    //   }),
+    // ])
+    // authenticatedUser = null
 
     await Promise.all(
       [...Array(30).keys()].map(i => {
diff --git a/cypress/integration/common/report.js b/cypress/integration/common/report.js
index 17481befe..5b0f96cb4 100644
--- a/cypress/integration/common/report.js
+++ b/cypress/integration/common/report.js
@@ -129,7 +129,7 @@ Given('somebody reported the following posts:', table => {
       .create('User', submitter)
       .authenticateAs(submitter)
       .mutate(`mutation($resourceId: ID!, $reasonCategory: ReasonCategory!, $reasonDescription: String!) {
-        report(resourceId: $resourceId, reasonCategory: $reasonCategory, reasonDescription: $reasonDescription) {
+        fileReport(resourceId: $resourceId, reasonCategory: $reasonCategory, reasonDescription: $reasonDescription) {
           type
         }
       }`, {
diff --git a/neo4j/change_disabled_relationship_to_claim_node.sh b/neo4j/change_disabled_relationship_to_claim_node.sh
index 15d7ce470..9d587d906 100755
--- a/neo4j/change_disabled_relationship_to_claim_node.sh
+++ b/neo4j/change_disabled_relationship_to_claim_node.sh
@@ -16,23 +16,23 @@ do
 done
 
 echo "
-// convert old DISABLED to new REVIEWED-Claim-BELONGS_TO structure
+// convert old DISABLED to new REVIEWED-Report-BELONGS_TO structure
 MATCH (moderator:User)-[disabled:DISABLED]->(disabledResource)
 WHERE disabledResource:User OR disabledResource:Comment OR disabledResource:Post
 DELETE disabled
-CREATE (moderator)-[review:REVIEWED]->(claim:Claim)-[:BELONGS_TO]->(disabledResource)
+CREATE (moderator)-[review:REVIEWED]->(report:Report)-[:BELONGS_TO]->(disabledResource)
 SET review.createdAt = toString(datetime()), review.updatedAt = review.createdAt, review.disable = true
-SET claim.id = randomUUID(), claim.createdAt = toString(datetime()), claim.updatedAt = claim.createdAt, claim.rule = 'latestReviewUpdatedAtRules', claim.disable = true, claim.closed = false
+SET report.id = randomUUID(), report.createdAt = toString(datetime()), report.updatedAt = report.createdAt, report.rule = 'latestReviewUpdatedAtRules', report.disable = true, report.closed = false
 
 // if disabledResource has no report, then create a moderators default report
-WITH moderator, disabledResource, claim
-OPTIONAL MATCH (disabledResourceReporter:User)-[existingReport:REPORTED]->(disabledResource)
+WITH moderator, disabledResource, report
+OPTIONAL MATCH (disabledResourceReporter:User)-[existingReport:FILED]->(disabledResource)
 FOREACH(disabledResource IN CASE WHEN existingReport IS NULL THEN [1] ELSE [] END | 
-  CREATE (moderator)-[addModeratorReport:REPORTED]->(claim)
+  CREATE (moderator)-[addModeratorReport:FILED]->(report)
   SET addModeratorReport.createdAt = toString(datetime()), addModeratorReport.reasonCategory = 'other', addModeratorReport.reasonDescription = 'Old DISABLED relation had no now mandatory report !!! Created automatically to ensure database consistency! Creation date is when the database manipulation happened.'
 )
 FOREACH(disabledResource IN CASE WHEN existingReport IS NOT NULL THEN [1] ELSE [] END | 
-  CREATE (disabledResourceReporter)-[moveModeratorReport:REPORTED]->(claim)
+  CREATE (disabledResourceReporter)-[moveModeratorReport:FILED]->(report)
   SET moveModeratorReport = existingReport
   DELETE existingReport
 )
@@ -41,12 +41,12 @@ RETURN disabledResource {.id};
 " | cypher-shell
 
 echo "
-// for REPORTED resources without DISABLED relation which are handled above, create new REPORTED-Claim-BELONGS_TO structure
-MATCH (reporter:User)-[oldReport:REPORTED]->(notDisabledResource)
+// for FILED resources without DISABLED relation which are handled above, create new FILED-Report-BELONGS_TO structure
+MATCH (reporter:User)-[oldReport:FILED]->(notDisabledResource)
 WHERE notDisabledResource:User OR notDisabledResource:Comment OR notDisabledResource:Post
-MERGE (claim:Claim)-[:BELONGS_TO]->(notDisabledResource)
-ON CREATE SET claim.id = randomUUID(), claim.createdAt = toString(datetime()), claim.updatedAt = claim.createdAt, claim.rule = 'latestReviewUpdatedAtRules', claim.disable = false, claim.closed = false
-CREATE (reporter)-[report:REPORTED]->(claim)
+MERGE (report:Report)-[:BELONGS_TO]->(notDisabledResource)
+ON CREATE SET report.id = randomUUID(), report.createdAt = toString(datetime()), report.updatedAt = report.createdAt, report.rule = 'latestReviewUpdatedAtRules', report.disable = false, report.closed = false
+CREATE (reporter)-[report:FILED]->(report)
 SET report = oldReport
 DELETE oldReport
 
diff --git a/neo4j/storeOldScriptsAsTemplates/change_report_node_to_relationship.sh b/neo4j/storeOldScriptsAsTemplates/change_report_node_to_relationship.sh
index 8fb2ad4db..da3a1dad9 100644
--- a/neo4j/storeOldScriptsAsTemplates/change_report_node_to_relationship.sh
+++ b/neo4j/storeOldScriptsAsTemplates/change_report_node_to_relationship.sh
@@ -16,9 +16,9 @@ do
 done
 
 echo "
-MATCH (submitter:User)-[:REPORTED]->(report:Report)-[:REPORTED]->(resource)
+MATCH (submitter:User)-[:FILED]->(report:Report)-[:FILED]->(resource)
 DETACH DELETE report
-CREATE (submitter)-[reported:REPORTED]->(resource)
+CREATE (submitter)-[reported:FILED]->(resource)
 SET reported.createdAt = toString(datetime())
 SET reported.reasonCategory = 'other'
 SET reported.reasonDescription = '!!! Created automatically to ensure database consistency! Creation date is when the database manipulation happened.'
diff --git a/webapp/constants/modals.js b/webapp/constants/modals.js
index f1d08fdc3..6011b8b88 100644
--- a/webapp/constants/modals.js
+++ b/webapp/constants/modals.js
@@ -1,4 +1,4 @@
-// this list equals to enums in GraphQL schema file "backend/src/schema/types/type/REPORTED.gql"
+// this list equals to enums in GraphQL schema file "backend/src/schema/types/type/FILED.gql"
 export const valuesReasonCategoryOptions = [
   'discrimination_etc',
   'pornographic_content_links',
diff --git a/webapp/graphql/Moderation.js b/webapp/graphql/Moderation.js
index 7e19241bc..ab6edccc2 100644
--- a/webapp/graphql/Moderation.js
+++ b/webapp/graphql/Moderation.js
@@ -8,7 +8,7 @@ export const reportListQuery = () => {
         createdAt
         reasonCategory
         reasonDescription
-        claim {
+        report {
           id
           createdAt
           updatedAt
@@ -114,7 +114,7 @@ export const reportListQuery = () => {
 export const reportMutation = () => {
   return gql`
     mutation($resourceId: ID!, $reasonCategory: ReasonCategory!, $reasonDescription: String!) {
-      report(
+      fileReport(
         resourceId: $resourceId
         reasonCategory: $reasonCategory
         reasonDescription: $reasonDescription
diff --git a/webapp/pages/moderation/index.vue b/webapp/pages/moderation/index.vue
index 4914c10e5..1c92610a5 100644
--- a/webapp/pages/moderation/index.vue
+++ b/webapp/pages/moderation/index.vue
@@ -238,84 +238,84 @@ export default {
       }
     },
   },
-  watch: {
-    reports: {
-      immediate: true,
-      handler(newReports) {
-        const newResourcesClaims = []
+  // watch: {
+  //   reports: {
+  //     immediate: true,
+  //     handler(newReports) {
+  //       const newResourcesClaims = []
+  //       if (!newReports) return null
+  //       newReports.forEach(report => {
+  //         const resource =
+  //           report.type === 'User'
+  //             ? report.user
+  //             : report.type === 'Post'
+  //             ? report.post
+  //             : report.type === 'Comment'
+  //             ? report.comment
+  //             : undefined
+  //         let idxResource = newResourcesClaims.findIndex(
+  //           resourceClaims => resourceClaims.resource.id === resource.id,
+  //         )
+  //         // if resource is not in resource list, then add it
+  //         if (idxResource === -1) {
+  //           idxResource = newResourcesClaims.length
+  //           newResourcesClaims.push({
+  //             type: report.type,
+  //             resource,
+  //             user: report.user,
+  //             post: report.post,
+  //             comment: report.comment,
+  //             contentBelongsToUser: report.type === 'User' ? null : resource.author,
+  //             claims: [],
+  //           })
+  //         }
+  //         let idxClaim = newResourcesClaims[idxResource].claims.findIndex(
+  //           claim => claim.id === report.claim.id,
+  //         )
+  //         // if claim is not in claim list, then add it
+  //         if (idxClaim === -1) {
+  //           idxClaim = newResourcesClaims[idxResource].claims.length
+  //           newResourcesClaims[idxResource].claims.push({
+  //             // it is the same for all reports of a claim
+  //             id: report.claim.id,
+  //             createdAt: report.claim.createdAt,
+  //             updatedAt: report.claim.updatedAt,
+  //             disable: report.claim.disable,
+  //             closed: report.claim.closed,
+  //             reports: [],
+  //           })
+  //         }
+  //         newResourcesClaims[idxResource].claims[idxClaim].reports.push(report)
+  //       })
 
-        newReports.forEach(report => {
-          const resource =
-            report.type === 'User'
-              ? report.user
-              : report.type === 'Post'
-              ? report.post
-              : report.type === 'Comment'
-              ? report.comment
-              : undefined
-          let idxResource = newResourcesClaims.findIndex(
-            resourceClaims => resourceClaims.resource.id === resource.id,
-          )
-          // if resource is not in resource list, then add it
-          if (idxResource === -1) {
-            idxResource = newResourcesClaims.length
-            newResourcesClaims.push({
-              type: report.type,
-              resource,
-              user: report.user,
-              post: report.post,
-              comment: report.comment,
-              contentBelongsToUser: report.type === 'User' ? null : resource.author,
-              claims: [],
-            })
-          }
-          let idxClaim = newResourcesClaims[idxResource].claims.findIndex(
-            claim => claim.id === report.claimId,
-          )
-          // if claim is not in claim list, then add it
-          if (idxClaim === -1) {
-            idxClaim = newResourcesClaims[idxResource].claims.length
-            newResourcesClaims[idxResource].claims.push({
-              // it is the same for all reports of a claim
-              id: report.claimId,
-              createdAt: report.claimCreatedAt,
-              updatedAt: report.claimUpdatedAt,
-              disable: report.claimDisable,
-              closed: report.claimClosed,
-              reports: [],
-            })
-          }
-          newResourcesClaims[idxResource].claims[idxClaim].reports.push(report)
-        })
+  //       // sorting of resource claims and their reports
+  //       newResourcesClaims.forEach(resourceClaims => {
+  //         // latestClaim by updatedAt rules
+  //         resourceClaims.claims.sort((a, b) => new Date(b.updatedAt) - new Date(a.updatedAt))
+  //         resourceClaims.latestClaim = {
+  //           id: resourceClaims.claims[0].id,
+  //           createdAt: resourceClaims.claims[0].createdAt,
+  //           updatedAt: resourceClaims.claims[0].updatedAt,
+  //           disable: resourceClaims.claims[0].disable,
+  //           closed: resourceClaims.claims[0].closed,
+  //         }
+  //         // display claims always by starting with latest createdAt
+  //         resourceClaims.claims.sort((a, b) => new Date(b.createdAt) - new Date(a.createdAt))
 
-        // sorting of resource claims and their reports
-        newResourcesClaims.forEach(resourceClaims => {
-          // latestClaim by updatedAt rules
-          resourceClaims.claims.sort((a, b) => new Date(b.updatedAt) - new Date(a.updatedAt))
-          resourceClaims.latestClaim = {
-            id: resourceClaims.claims[0].id,
-            createdAt: resourceClaims.claims[0].createdAt,
-            updatedAt: resourceClaims.claims[0].updatedAt,
-            disable: resourceClaims.claims[0].disable,
-            closed: resourceClaims.claims[0].closed,
-          }
-          // display claims always by starting with latest createdAt
-          resourceClaims.claims.sort((a, b) => new Date(b.createdAt) - new Date(a.createdAt))
+  //         resourceClaims.claims.forEach(claim => {
+  //           // display reports always by starting with latest createdAt
+  //           claim.reports.sort((a, b) => new Date(b.createdAt) - new Date(a.createdAt))
+  //         })
+  //       })
+  //       // display resources by starting with claims by their latest createdAt
+  //       newResourcesClaims.sort(
+  //         (a, b) => new Date(b.claims[0].createdAt) - new Date(a.claims[0].createdAt),
+  //       )
 
-          resourceClaims.claims.forEach(claim => {
-            // display reports always by starting with latest createdAt
-            claim.reports.sort((a, b) => new Date(b.createdAt) - new Date(a.createdAt))
-          })
-        })
-        // display resources by starting with claims by their latest createdAt
-        newResourcesClaims.sort(
-          (a, b) => new Date(b.claims[0].createdAt) - new Date(a.claims[0].createdAt),
-        )
-
-        this.resourcesClaims = newResourcesClaims
-      },
-    },
-  },
+  //       this.resourcesClaims = newResourcesClaims
+  //     },
+  //   },
+  // },
   methods: {
     confirm(resourceClaims) {
       this.openModal(resourceClaims)
@@ -386,7 +386,8 @@ export default {
         return {}
       },
       update({ reports }) {
-        return reports
+        console.log(reports)
+        // this.resourcesClaims = reports
       },
       fetchPolicy: 'cache-and-network',
     },

From eceeecd9b7b4e32f41ce791a1937a174983faaf5 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Tue, 26 Nov 2019 21:34:21 +0100
Subject: [PATCH 084/174] Refactor reports query, tests

- Query returns an array of Reports with all the filedReports that
belong to them
- Mutation returns the same
---
 backend/src/schema/resolvers/reports.js      |  54 ++++--
 backend/src/schema/resolvers/reports.spec.js | 178 +++++++++++--------
 backend/src/schema/types/type/FILED.gql      |  18 --
 backend/src/schema/types/type/Report.gql     |  17 +-
 4 files changed, 165 insertions(+), 102 deletions(-)

diff --git a/backend/src/schema/resolvers/reports.js b/backend/src/schema/resolvers/reports.js
index af7bb3555..a79ab65ae 100644
--- a/backend/src/schema/resolvers/reports.js
+++ b/backend/src/schema/resolvers/reports.js
@@ -19,7 +19,7 @@ export default {
             WITH submitter, resource, report
             CREATE (report)<-[filed:FILED {createdAt: $createdAt, reasonCategory: $reasonCategory, reasonDescription: $reasonDescription}]-(submitter)
 
-            RETURN submitter, report, filed, resource, labels(resource)[0] AS type
+            RETURN submitter, report, resource, labels(resource)[0] AS type
           `,
           {
             resourceId,
@@ -32,7 +32,6 @@ export default {
         return reportRelationshipTransactionResponse.records.map(record => ({
           submitter: record.get('submitter').properties,
           report: record.get('report').properties,
-          filed: record.get('filed').properties,
           resource: record.get('resource').properties,
           type: record.get('type'),
         }))
@@ -40,10 +39,9 @@ export default {
       try {
         const txResult = await writeTxResultPromise
         if (!txResult[0]) return null
-        const { submitter, report, filed, resource, type } = txResult[0]
+        const { submitter, report, resource, type } = txResult[0]
         createdRelationshipWithNestedAttributes = {
-          ...filed,
-          report,
+          ...report,
           post: null,
           comment: null,
           user: null,
@@ -74,10 +72,10 @@ export default {
       let reports, orderByClause
       switch (params.orderBy) {
         case 'createdAt_asc':
-          orderByClause = 'ORDER BY report.createdAt ASC, filed.createdAt DESC'
+          orderByClause = 'ORDER BY report.createdAt ASC'
           break
         case 'createdAt_desc':
-          orderByClause = 'ORDER BY report.createdAt DESC, filed.createdAt DESC'
+          orderByClause = 'ORDER BY report.createdAt DESC'
           break
         default:
           orderByClause = ''
@@ -87,7 +85,7 @@ export default {
           `
           MATCH (submitter:User)-[filed:FILED]->(report:Report)-[:BELONGS_TO]->(resource)
           WHERE resource:User OR resource:Post OR resource:Comment
-          RETURN submitter, report, filed, resource, labels(resource)[0] as type
+          RETURN submitter, report, resource, labels(resource)[0] as type
           ${orderByClause}
           `,
           {},
@@ -95,7 +93,6 @@ export default {
         return allReportsTransactionResponse.records.map(record => ({
           submitter: record.get('submitter').properties,
           report: record.get('report').properties,
-          filed: record.get('filed').properties,
           resource: record.get('resource').properties,
           type: record.get('type'),
         }))
@@ -104,10 +101,9 @@ export default {
         const txResult = await readTxPromise
         if (!txResult[0]) return null
         reports = txResult.map(reportedRecord => {
-          const { report, submitter, filed, resource, type } = reportedRecord
+          const { report, submitter, resource, type } = reportedRecord
           const relationshipWithNestedAttributes = {
             ...report,
-            filed,
             post: null,
             comment: null,
             user: null,
@@ -133,4 +129,40 @@ export default {
       return reports
     },
   },
+  Report: {
+    reportsFiled: async (parent, _params, context, _resolveInfo) => {
+      if (typeof parent.reportsFiled !== 'undefined') return parent.reportsFiled
+      const session = context.driver.session()
+      const { id } = parent
+      let reportsFiled
+      const readTxPromise = session.readTransaction(async tx => {
+        const allReportsTransactionResponse = await tx.run(
+          `
+          MATCH (submitter:User)-[filed:FILED]->(report:Report {id: $id})
+          RETURN filed, submitter
+          `,
+          { id },
+        )
+        return allReportsTransactionResponse.records.map(record => ({
+          submitter: record.get('submitter').properties,
+          filed: record.get('filed').properties,
+        }))
+      })
+      try {
+        const txResult = await readTxPromise
+        if (!txResult[0]) return null
+        reportsFiled = txResult.map(reportedRecord => {
+          const { submitter, filed } = reportedRecord
+          const relationshipWithNestedAttributes = {
+            ...filed,
+            submitter,
+          }
+          return relationshipWithNestedAttributes
+        })
+      } finally {
+        session.close()
+      }
+      return reportsFiled
+    },
+  },
 }
diff --git a/backend/src/schema/resolvers/reports.spec.js b/backend/src/schema/resolvers/reports.spec.js
index adf9048f0..9f66bb690 100644
--- a/backend/src/schema/resolvers/reports.spec.js
+++ b/backend/src/schema/resolvers/reports.spec.js
@@ -18,13 +18,12 @@ describe('file a report on a resource', () => {
         reasonCategory: $reasonCategory
         reasonDescription: $reasonDescription
       ) {
+        id
         createdAt
-        reasonCategory
-        reasonDescription
+        updatedAt
+        disable
+        closed
         type
-        submitter {
-          email
-        }
         user {
           name
         }
@@ -34,12 +33,13 @@ describe('file a report on a resource', () => {
         comment {
           content
         }
-        report {
-          id
+        reportsFiled {
+          submitter {
+            id
+          }
           createdAt
-          updatedAt
-          disable
-          closed
+          reasonCategory
+          reasonDescription
         }
       }
     }
@@ -129,14 +129,15 @@ describe('file a report on a resource', () => {
             ).resolves.toMatchObject({
               data: {
                 fileReport: {
-                  type: 'User',
-                  report: {
-                    id: expect.any(String),
-                    createdAt: expect.any(String),
-                    updatedAt: expect.any(String),
-                    disable: false,
-                    closed: false,
+                  id: expect.any(String),
+                  createdAt: expect.any(String),
+                  updatedAt: expect.any(String),
+                  disable: false,
+                  closed: false,
+                  user: {
+                    name: 'abusive-user',
                   },
+                  type: 'User',
                 },
               },
               errors: undefined,
@@ -153,7 +154,7 @@ describe('file a report on a resource', () => {
               mutation: reportMutation,
               variables: { ...variables, resourceId: 'abusive-user-id' },
             })
-            expect(firstReport.data.fileReport.report).toEqual(secondReport.data.fileReport.report)
+            expect(firstReport.data.fileReport.id).toEqual(secondReport.data.fileReport.id)
           })
 
           it.todo('creates multiple reports')
@@ -169,7 +170,22 @@ describe('file a report on a resource', () => {
             ).resolves.toMatchObject({
               data: {
                 fileReport: {
+                  id: expect.any(String),
+                  createdAt: expect.any(String),
+                  updatedAt: expect.any(String),
+                  disable: false,
+                  closed: false,
                   type: 'User',
+                  reportsFiled: [
+                    {
+                      submitter: {
+                        id: 'current-user-id',
+                      },
+                      createdAt: expect.any(String),
+                      reasonCategory: 'other',
+                      reasonDescription: 'Violates code of conduct !!!',
+                    },
+                  ],
                 },
               },
               errors: undefined,
@@ -203,9 +219,13 @@ describe('file a report on a resource', () => {
             ).resolves.toMatchObject({
               data: {
                 fileReport: {
-                  submitter: {
-                    email: 'test@example.org',
-                  },
+                  reportsFiled: [
+                    {
+                      submitter: {
+                        id: 'current-user-id',
+                      },
+                    },
+                  ],
                 },
               },
               errors: undefined,
@@ -241,7 +261,11 @@ describe('file a report on a resource', () => {
             ).resolves.toMatchObject({
               data: {
                 fileReport: {
-                  reasonCategory: 'criminal_behavior_violation_german_law',
+                  reportsFiled: [
+                    {
+                      reasonCategory: 'criminal_behavior_violation_german_law',
+                    },
+                  ],
                 },
               },
               errors: undefined,
@@ -282,7 +306,11 @@ describe('file a report on a resource', () => {
             ).resolves.toMatchObject({
               data: {
                 fileReport: {
-                  reasonDescription: 'My reason!',
+                  reportsFiled: [
+                    {
+                      reasonDescription: 'My reason!',
+                    },
+                  ],
                 },
               },
               errors: undefined,
@@ -302,7 +330,11 @@ describe('file a report on a resource', () => {
             ).resolves.toMatchObject({
               data: {
                 fileReport: {
-                  reasonDescription: 'My reason !',
+                  reportsFiled: [
+                    {
+                      reasonDescription: 'My reason !',
+                    },
+                  ],
                 },
               },
               errors: undefined,
@@ -469,12 +501,11 @@ describe('file a report on a resource', () => {
     const reportsQuery = gql`
       query {
         reports(orderBy: createdAt_desc) {
+          id
           createdAt
-          reasonCategory
-          reasonDescription
-          submitter {
-            id
-          }
+          updatedAt
+          disable
+          closed
           type
           user {
             id
@@ -485,12 +516,13 @@ describe('file a report on a resource', () => {
           comment {
             id
           }
-          report {
-            id
+          reportsFiled {
+            submitter {
+              id
+            }
             createdAt
-            updatedAt
-            disable
-            closed
+            reasonCategory
+            reasonDescription
           }
         }
       }
@@ -602,67 +634,73 @@ describe('file a report on a resource', () => {
         const expected = {
           reports: expect.arrayContaining([
             expect.objectContaining({
+              id: expect.any(String),
               createdAt: expect.any(String),
-              reasonCategory: 'doxing',
-              reasonDescription: 'This user is harassing me with bigoted remarks',
-              submitter: expect.objectContaining({
-                id: 'current-user-id',
-              }),
+              updatedAt: expect.any(String),
+              disable: false,
+              closed: false,
               type: 'User',
               user: expect.objectContaining({
                 id: 'abusive-user-1',
               }),
               post: null,
               comment: null,
-              report: {
-                id: expect.any(String),
-                createdAt: expect.any(String),
-                updatedAt: expect.any(String),
-                disable: false,
-                closed: false,
-              },
+              reportsFiled: expect.arrayContaining([
+                expect.objectContaining({
+                  submitter: expect.objectContaining({
+                    id: 'current-user-id',
+                  }),
+                  createdAt: expect.any(String),
+                  reasonCategory: 'doxing',
+                  reasonDescription: 'This user is harassing me with bigoted remarks',
+                }),
+              ]),
             }),
             expect.objectContaining({
+              id: expect.any(String),
               createdAt: expect.any(String),
-              reasonCategory: 'other',
-              reasonDescription: 'This comment is bigoted',
-              submitter: expect.objectContaining({
-                id: 'current-user-id',
-              }),
+              updatedAt: expect.any(String),
+              disable: false,
+              closed: false,
               type: 'Post',
               user: null,
               post: expect.objectContaining({
                 id: 'abusive-post-1',
               }),
               comment: null,
-              report: {
-                id: expect.any(String),
-                createdAt: expect.any(String),
-                updatedAt: expect.any(String),
-                disable: false,
-                closed: false,
-              },
+              reportsFiled: expect.arrayContaining([
+                expect.objectContaining({
+                  submitter: expect.objectContaining({
+                    id: 'current-user-id',
+                  }),
+                  createdAt: expect.any(String),
+                  reasonCategory: 'other',
+                  reasonDescription: 'This comment is bigoted',
+                }),
+              ]),
             }),
             expect.objectContaining({
+              id: expect.any(String),
               createdAt: expect.any(String),
-              reasonCategory: 'discrimination_etc',
-              reasonDescription: 'This post is bigoted',
-              submitter: expect.objectContaining({
-                id: 'current-user-id',
-              }),
+              updatedAt: expect.any(String),
+              disable: false,
+              closed: false,
               type: 'Comment',
               user: null,
               post: null,
               comment: expect.objectContaining({
                 id: 'abusive-comment-1',
               }),
-              report: {
-                id: expect.any(String),
-                createdAt: expect.any(String),
-                updatedAt: expect.any(String),
-                disable: false,
-                closed: false,
-              },
+              reportsFiled: expect.arrayContaining([
+                expect.objectContaining({
+                  submitter: expect.objectContaining({
+                    id: 'current-user-id',
+                  }),
+                  createdAt: expect.any(String),
+                  reasonCategory: 'discrimination_etc',
+                  reasonDescription: 'This post is bigoted',
+                }),
+              ]),
             }),
           ]),
         }
diff --git a/backend/src/schema/types/type/FILED.gql b/backend/src/schema/types/type/FILED.gql
index 326188660..752139e04 100644
--- a/backend/src/schema/types/type/FILED.gql
+++ b/backend/src/schema/types/type/FILED.gql
@@ -2,17 +2,7 @@ type FILED {
   createdAt: String!
   reasonCategory: ReasonCategory!
   reasonDescription: String!
-  report: Report  @cypher(
-    statement: "MATCH (resource)<-[:BELONGS_TO]-(report:Report)<-[:FILED]-(:User) WHERE NOT resource.deleted = true AND NOT resource.disabled = true RETURN report"
-  )
-
   submitter: User
-    # @cypher(statement: "MATCH (resource)<-[:FILED]-(user:User) RETURN user")
-  type: String
-    # @cypher(statement: "MATCH (resource)<-[:FILED]-(user:User) RETURN labels(resource)[0]")
-  user: User
-  post: Post
-  comment: Comment
 }
 
 # this list equals the strings of an array in file "webapp/constants/modals.js"
@@ -34,11 +24,3 @@ enum ReportOrdering {
   createdAt_asc
   createdAt_desc
 }
-
-type Query {
-  reports(orderBy: ReportOrdering): [FILED]
-}
-
-type Mutation {
-  fileReport(resourceId: ID!, reasonCategory: ReasonCategory!, reasonDescription: String!): FILED
-}
diff --git a/backend/src/schema/types/type/Report.gql b/backend/src/schema/types/type/Report.gql
index 8bbbf096c..ce4e511f8 100644
--- a/backend/src/schema/types/type/Report.gql
+++ b/backend/src/schema/types/type/Report.gql
@@ -5,12 +5,23 @@ type Report {
   rule: ReportRule!
   disable: Boolean!
   closed: Boolean!
-  resource: ReportResource
-  filed: [FILED]
+  reportsFiled: [FILED]
+  user: User
+  post: Post
+  comment: Comment
+  type: String
 }
 # not yet supported
-union ReportResource = User | Post | Comment
+# union ReportResource = User | Post | Comment
 
 enum ReportRule {
   latestReviewUpdatedAtRules
 }
+
+type Mutation {
+  fileReport(resourceId: ID!, reasonCategory: ReasonCategory!, reasonDescription: String!): Report
+}
+
+type Query {
+  reports(orderBy: ReportOrdering): [Report]
+}

From ef17b40678de17226cdc1b35459f06785877ddc6 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 27 Nov 2019 04:21:28 +0000
Subject: [PATCH 085/174] build(deps-dev): bump eslint-plugin-jest in /backend

Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 23.0.4 to 23.0.5.
- [Release notes](https://github.com/jest-community/eslint-plugin-jest/releases)
- [Changelog](https://github.com/jest-community/eslint-plugin-jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jest-community/eslint-plugin-jest/compare/v23.0.4...v23.0.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 backend/package.json | 2 +-
 backend/yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/backend/package.json b/backend/package.json
index 7c66ba4a2..ebbab5016 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -115,7 +115,7 @@
     "eslint-config-prettier": "~6.7.0",
     "eslint-config-standard": "~14.1.0",
     "eslint-plugin-import": "~2.18.2",
-    "eslint-plugin-jest": "~23.0.4",
+    "eslint-plugin-jest": "~23.0.5",
     "eslint-plugin-node": "~10.0.0",
     "eslint-plugin-prettier": "~3.1.1",
     "eslint-plugin-promise": "~4.2.1",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 7f0c95a43..dd356b2b3 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -3407,10 +3407,10 @@ eslint-plugin-import@~2.18.2:
     read-pkg-up "^2.0.0"
     resolve "^1.11.0"
 
-eslint-plugin-jest@~23.0.4:
-  version "23.0.4"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-23.0.4.tgz#1ab81ffe3b16c5168efa72cbd4db14d335092aa0"
-  integrity sha512-OaP8hhT8chJNodUPvLJ6vl8gnalcsU/Ww1t9oR3HnGdEWjm/DdCCUXLOral+IPGAeWu/EwgVQCK/QtxALpH1Yw==
+eslint-plugin-jest@~23.0.5:
+  version "23.0.5"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-23.0.5.tgz#3c7c5e636c5a21677d2dfc8ba5424233ee2b9f27"
+  integrity sha512-etxXrWsFWzxsrxKwJnFC38uppH/vlJ3oF7Wmp/cxedqxRIxVhXup8e5y5MmtVXelevgxrgA1QS1vo8j889iK5Q==
   dependencies:
     "@typescript-eslint/experimental-utils" "^2.5.0"
 

From 6798d18b92d2c36ffeeebd5b0fcc7518d7465739 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 27 Nov 2019 04:22:51 +0000
Subject: [PATCH 086/174] build(deps): bump @hapi/joi from 16.1.7 to 16.1.8 in
 /backend

Bumps [@hapi/joi](https://github.com/hapijs/joi) from 16.1.7 to 16.1.8.
- [Release notes](https://github.com/hapijs/joi/releases)
- [Changelog](https://github.com/hapijs/joi/blob/master/CHANGELOG.md)
- [Commits](https://github.com/hapijs/joi/compare/v16.1.7...v16.1.8)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 backend/package.json | 2 +-
 backend/yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/backend/package.json b/backend/package.json
index 7c66ba4a2..48b5b9fce 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -34,7 +34,7 @@
     ]
   },
   "dependencies": {
-    "@hapi/joi": "^16.1.7",
+    "@hapi/joi": "^16.1.8",
     "@sentry/node": "^5.9.0",
     "apollo-cache-inmemory": "~1.6.3",
     "apollo-client": "~2.6.4",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 7f0c95a43..12acd2480 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -879,10 +879,10 @@
     "@hapi/hoek" "8.x.x"
     "@hapi/topo" "3.x.x"
 
-"@hapi/joi@^16.1.7":
-  version "16.1.7"
-  resolved "https://registry.yarnpkg.com/@hapi/joi/-/joi-16.1.7.tgz#360857223a87bb1f5f67691537964c1b4908ed93"
-  integrity sha512-anaIgnZhNooG3LJLrTFzgGALTiO97zRA1UkvQHm9KxxoSiIzCozB3RCNCpDnfhTJD72QlrHA8nwGmNgpFFCIeg==
+"@hapi/joi@^16.1.8":
+  version "16.1.8"
+  resolved "https://registry.yarnpkg.com/@hapi/joi/-/joi-16.1.8.tgz#84c1f126269489871ad4e2decc786e0adef06839"
+  integrity sha512-wAsVvTPe+FwSrsAurNt5vkg3zo+TblvC5Bb1zMVK6SJzZqw9UrJnexxR+76cpePmtUZKHAPxcQ2Bf7oVHyahhg==
   dependencies:
     "@hapi/address" "^2.1.2"
     "@hapi/formula" "^1.2.0"

From 448c29a39bd60dde7aba221ed2b20662d80d7da9 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 27 Nov 2019 04:22:56 +0000
Subject: [PATCH 087/174] build(deps-dev): bump eslint-plugin-jest in /webapp

Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 23.0.4 to 23.0.5.
- [Release notes](https://github.com/jest-community/eslint-plugin-jest/releases)
- [Changelog](https://github.com/jest-community/eslint-plugin-jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jest-community/eslint-plugin-jest/compare/v23.0.4...v23.0.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 webapp/package.json | 2 +-
 webapp/yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/webapp/package.json b/webapp/package.json
index 4af522143..90665270d 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -116,7 +116,7 @@
     "eslint-config-standard": "~14.1.0",
     "eslint-loader": "~3.0.2",
     "eslint-plugin-import": "~2.18.2",
-    "eslint-plugin-jest": "~23.0.4",
+    "eslint-plugin-jest": "~23.0.5",
     "eslint-plugin-node": "~10.0.0",
     "eslint-plugin-prettier": "~3.1.1",
     "eslint-plugin-promise": "~4.2.1",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index ea4d5dc5a..7b91f49e0 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -7089,10 +7089,10 @@ eslint-plugin-import@~2.18.2:
     read-pkg-up "^2.0.0"
     resolve "^1.11.0"
 
-eslint-plugin-jest@~23.0.4:
-  version "23.0.4"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-23.0.4.tgz#1ab81ffe3b16c5168efa72cbd4db14d335092aa0"
-  integrity sha512-OaP8hhT8chJNodUPvLJ6vl8gnalcsU/Ww1t9oR3HnGdEWjm/DdCCUXLOral+IPGAeWu/EwgVQCK/QtxALpH1Yw==
+eslint-plugin-jest@~23.0.5:
+  version "23.0.5"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-23.0.5.tgz#3c7c5e636c5a21677d2dfc8ba5424233ee2b9f27"
+  integrity sha512-etxXrWsFWzxsrxKwJnFC38uppH/vlJ3oF7Wmp/cxedqxRIxVhXup8e5y5MmtVXelevgxrgA1QS1vo8j889iK5Q==
   dependencies:
     "@typescript-eslint/experimental-utils" "^2.5.0"
 

From d03d66905656d7ef9633ba79715ccbaff11bf66f Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Wed, 27 Nov 2019 17:26:42 +0100
Subject: [PATCH 088/174] Remove reviewedByModerator from resources

- moved to Report node, as the report was reviewed by the moderator...
a resource can have many reports on them, so we are interested in
grouping reviewed/filed by report
---
 backend/src/schema/resolvers/comments.js      |  4 ----
 .../resolvers/helpers/reportResource.js       | 21 -------------------
 backend/src/schema/resolvers/posts.js         |  4 ----
 backend/src/schema/resolvers/users.js         |  4 ----
 backend/src/schema/types/type/Comment.gql     |  9 --------
 backend/src/schema/types/type/Post.gql        |  9 --------
 backend/src/schema/types/type/User.gql        |  9 --------
 7 files changed, 60 deletions(-)
 delete mode 100644 backend/src/schema/resolvers/helpers/reportResource.js

diff --git a/backend/src/schema/resolvers/comments.js b/backend/src/schema/resolvers/comments.js
index 57d4da2b9..16fa2ec29 100644
--- a/backend/src/schema/resolvers/comments.js
+++ b/backend/src/schema/resolvers/comments.js
@@ -1,6 +1,5 @@
 import uuid from 'uuid/v4'
 import Resolver from './helpers/Resolver'
-import { queryReviewedByModerator } from './helpers/reportResource.js'
 
 export default {
   Mutation: {
@@ -72,8 +71,5 @@ export default {
         post: '-[:COMMENTS]->(related:Post)',
       },
     }),
-    reviewedByModerator: async (parent, _params, context, _resolveInfo) => {
-      return queryReviewedByModerator('Comment', parent, context)
-    },
   },
 }
diff --git a/backend/src/schema/resolvers/helpers/reportResource.js b/backend/src/schema/resolvers/helpers/reportResource.js
deleted file mode 100644
index ff32e4a14..000000000
--- a/backend/src/schema/resolvers/helpers/reportResource.js
+++ /dev/null
@@ -1,21 +0,0 @@
-export async function queryReviewedByModerator(label, parent, context) {
-  if (typeof parent.reviewedByModerator !== 'undefined') return parent.reviewedByModerator
-  const { id } = parent
-  const statement = `
-    MATCH (resource {id: $id})<-[:BELONGS_TO]-(report:Report)<-[review:REVIEWED]-(moderator:User)
-    WHERE $label IN labels(resource)
-    RETURN moderator
-    ORDER BY report.updatedAt DESC, review.updatedAt DESC
-    LIMIT 1
-  `
-  let reviewedByModerator
-  const session = context.driver.session()
-  try {
-    const result = await session.run(statement, { label, id })
-    const [firstElement] = result.records.map(r => r.get('moderator').properties)
-    reviewedByModerator = firstElement
-  } finally {
-    session.close()
-  }
-  return reviewedByModerator
-}
diff --git a/backend/src/schema/resolvers/posts.js b/backend/src/schema/resolvers/posts.js
index 495125729..5583eead5 100644
--- a/backend/src/schema/resolvers/posts.js
+++ b/backend/src/schema/resolvers/posts.js
@@ -5,7 +5,6 @@ import { getBlockedUsers, getBlockedByUsers } from './users.js'
 import { mergeWith, isArray, isEmpty } from 'lodash'
 import { UserInputError } from 'apollo-server'
 import Resolver from './helpers/Resolver'
-import { queryReviewedByModerator } from './helpers/reportResource.js'
 
 const filterForBlockedUsers = async (params, context) => {
   if (!context.user) return params
@@ -342,8 +341,5 @@ export default {
       }
       return relatedContributions
     },
-    reviewedByModerator: async (parent, _params, context, _resolveInfo) => {
-      return queryReviewedByModerator('Post', parent, context)
-    },
   },
 }
diff --git a/backend/src/schema/resolvers/users.js b/backend/src/schema/resolvers/users.js
index 7a9a1f0bc..c25d20c0f 100644
--- a/backend/src/schema/resolvers/users.js
+++ b/backend/src/schema/resolvers/users.js
@@ -3,7 +3,6 @@ import fileUpload from './fileUpload'
 import { neode } from '../../bootstrap/neo4j'
 import { UserInputError, ForbiddenError } from 'apollo-server'
 import Resolver from './helpers/Resolver'
-import { queryReviewedByModerator } from './helpers/reportResource.js'
 
 const instance = neode()
 
@@ -215,8 +214,5 @@ export default {
         badges: '<-[:REWARDED]-(related:Badge)',
       },
     }),
-    reviewedByModerator: async (parent, _params, context, _resolveInfo) => {
-      return queryReviewedByModerator('User', parent, context)
-    },
   },
 }
diff --git a/backend/src/schema/types/type/Comment.gql b/backend/src/schema/types/type/Comment.gql
index 23ab3aae0..cf53df41d 100644
--- a/backend/src/schema/types/type/Comment.gql
+++ b/backend/src/schema/types/type/Comment.gql
@@ -47,15 +47,6 @@ type Comment {
   updatedAt: String
   deleted: Boolean
   disabled: Boolean
-  reviewedByModerator: User
-    @cypher(
-      statement: """
-        MATCH (this)<-[:BELONGS_TO]-(report:Report)<-[review:REVIEWED]-(moderator:User)
-        RETURN moderator
-        ORDER BY report.updatedAt DESC, review.updatedAt DESC
-        LIMIT 1
-      """
-    )
 }
 
 type Query {
diff --git a/backend/src/schema/types/type/Post.gql b/backend/src/schema/types/type/Post.gql
index eb6ab845a..fd387981d 100644
--- a/backend/src/schema/types/type/Post.gql
+++ b/backend/src/schema/types/type/Post.gql
@@ -121,15 +121,6 @@ type Post {
   visibility: Visibility
   deleted: Boolean
   disabled: Boolean
-  reviewedByModerator: User
-    @cypher(
-      statement: """
-        MATCH (this)<-[:BELONGS_TO]-(report:Report)<-[review:REVIEWED]-(moderator:User)
-        RETURN moderator
-        ORDER BY report.updatedAt DESC, review.updatedAt DESC
-        LIMIT 1
-      """
-    )
   pinned: Boolean
   createdAt: String
   updatedAt: String
diff --git a/backend/src/schema/types/type/User.gql b/backend/src/schema/types/type/User.gql
index 499718e21..243f45322 100644
--- a/backend/src/schema/types/type/User.gql
+++ b/backend/src/schema/types/type/User.gql
@@ -33,15 +33,6 @@ type User {
   coverImg: String
   deleted: Boolean
   disabled: Boolean
-  reviewedByModerator: User
-    @cypher(
-      statement: """
-        MATCH (this)<-[:BELONGS_TO]-(report:Report)<-[review:REVIEWED]-(moderator:User)
-        RETURN moderator
-        ORDER BY report.updatedAt DESC, review.updatedAt DESC
-        LIMIT 1
-      """
-    )
   role: UserGroup!
   publicKey: String
   invitedBy: User @relation(name: "INVITED", direction: "IN")

From 3a058443562c657aa8954be046898e740e523500 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Wed, 27 Nov 2019 17:31:51 +0100
Subject: [PATCH 089/174] Refactor tests/resolvers

- Favor union as it's cleaner and less code
- refactor tests to new implementation
- add reviewedByModerator resolver
---
 backend/src/schema/resolvers/reports.js      | 110 +++++++--------
 backend/src/schema/resolvers/reports.spec.js | 133 +++++++------------
 backend/src/schema/types/type/Report.gql     |   9 +-
 3 files changed, 100 insertions(+), 152 deletions(-)

diff --git a/backend/src/schema/resolvers/reports.js b/backend/src/schema/resolvers/reports.js
index a79ab65ae..9269c9751 100644
--- a/backend/src/schema/resolvers/reports.js
+++ b/backend/src/schema/resolvers/reports.js
@@ -1,3 +1,13 @@
+const transformReturnType = record => {
+  return {
+    ...record.get('report').properties,
+    to: {
+      __typename: record.get('type'),
+      ...record.get('resource').properties,
+    },
+  }
+}
+
 export default {
   Mutation: {
     fileReport: async (_parent, params, context, _resolveInfo) => {
@@ -5,21 +15,18 @@ export default {
       const { resourceId, reasonCategory, reasonDescription } = params
       const { driver, user } = context
       const session = driver.session()
-      const writeTxResultPromise = session.writeTransaction(async txc => {
-        const reportRelationshipTransactionResponse = await txc.run(
+      const reportWriteTxResultPromise = session.writeTransaction(async txc => {
+        const reportTransactionResponse = await txc.run(
           `
             MATCH (submitter:User {id: $submitterId})
             MATCH (resource {id: $resourceId})
             WHERE resource:User OR resource:Post OR resource:Comment
-            // no open report, create one
             MERGE (resource)<-[:BELONGS_TO]-(report:Report {closed: false})
             ON CREATE SET report.id = randomUUID(), report.createdAt = $createdAt, report.updatedAt = report.createdAt, report.rule = 'latestReviewUpdatedAtRules', report.disable = resource.disabled, report.closed = false
-            // ON MATCH: do not update report.updatedAt !!! that is only for reviews!
-            // Create report to report
             WITH submitter, resource, report
             CREATE (report)<-[filed:FILED {createdAt: $createdAt, reasonCategory: $reasonCategory, reasonDescription: $reasonDescription}]-(submitter)
 
-            RETURN submitter, report, resource, labels(resource)[0] AS type
+            RETURN report, resource, labels(resource)[0] AS type
           `,
           {
             resourceId,
@@ -29,36 +36,12 @@ export default {
             reasonDescription,
           },
         )
-        return reportRelationshipTransactionResponse.records.map(record => ({
-          submitter: record.get('submitter').properties,
-          report: record.get('report').properties,
-          resource: record.get('resource').properties,
-          type: record.get('type'),
-        }))
+        return reportTransactionResponse.records.map(transformReturnType)
       })
       try {
-        const txResult = await writeTxResultPromise
+        const txResult = await reportWriteTxResultPromise
         if (!txResult[0]) return null
-        const { submitter, report, resource, type } = txResult[0]
-        createdRelationshipWithNestedAttributes = {
-          ...report,
-          post: null,
-          comment: null,
-          user: null,
-          submitter,
-          type,
-        }
-        switch (type) {
-          case 'Post':
-            createdRelationshipWithNestedAttributes.post = resource
-            break
-          case 'Comment':
-            createdRelationshipWithNestedAttributes.comment = resource
-            break
-          case 'User':
-            createdRelationshipWithNestedAttributes.user = resource
-            break
-        }
+        createdRelationshipWithNestedAttributes = txResult[0]
       } finally {
         session.close()
       }
@@ -85,44 +68,17 @@ export default {
           `
           MATCH (submitter:User)-[filed:FILED]->(report:Report)-[:BELONGS_TO]->(resource)
           WHERE resource:User OR resource:Post OR resource:Comment
-          RETURN submitter, report, resource, labels(resource)[0] as type
+          RETURN DISTINCT report, resource, labels(resource)[0] as type
           ${orderByClause}
           `,
           {},
         )
-        return allReportsTransactionResponse.records.map(record => ({
-          submitter: record.get('submitter').properties,
-          report: record.get('report').properties,
-          resource: record.get('resource').properties,
-          type: record.get('type'),
-        }))
+        return allReportsTransactionResponse.records.map(transformReturnType)
       })
       try {
         const txResult = await readTxPromise
         if (!txResult[0]) return null
-        reports = txResult.map(reportedRecord => {
-          const { report, submitter, resource, type } = reportedRecord
-          const relationshipWithNestedAttributes = {
-            ...report,
-            post: null,
-            comment: null,
-            user: null,
-            submitter,
-            type,
-          }
-          switch (type) {
-            case 'Post':
-              relationshipWithNestedAttributes.post = resource
-              break
-            case 'Comment':
-              relationshipWithNestedAttributes.comment = resource
-              break
-            case 'User':
-              relationshipWithNestedAttributes.user = resource
-              break
-          }
-          return relationshipWithNestedAttributes
-        })
+        reports = txResult
       } finally {
         session.close()
       }
@@ -164,5 +120,33 @@ export default {
       }
       return reportsFiled
     },
+    reviewedByModerator: async (parent, _params, context, _resolveInfo) => {
+      if (typeof parent.reviewedByModerator !== 'undefined') return parent.reviewedByModerator
+      const session = context.driver.session()
+      const { id } = parent
+      let reviewedByModerator
+      const readTxPromise = session.readTransaction(async tx => {
+        const allReportsTransactionResponse = await tx.run(
+          `
+            MATCH (resource)<-[:BELONGS_TO]-(report:Report {id: $id})<-[review:REVIEWED]-(moderator:User)
+            RETURN moderator
+            ORDER BY report.updatedAt DESC, review.updatedAt DESC
+            LIMIT 1
+          `,
+          { id },
+        )
+        return allReportsTransactionResponse.records.map(
+          record => record.get('moderator').properties,
+        )
+      })
+      try {
+        const txResult = await readTxPromise
+        if (!txResult[0]) return null
+        reviewedByModerator = txResult[0]
+      } finally {
+        session.close()
+      }
+      return reviewedByModerator
+    },
   },
 }
diff --git a/backend/src/schema/resolvers/reports.spec.js b/backend/src/schema/resolvers/reports.spec.js
index 9f66bb690..e5552497d 100644
--- a/backend/src/schema/resolvers/reports.spec.js
+++ b/backend/src/schema/resolvers/reports.spec.js
@@ -23,15 +23,17 @@ describe('file a report on a resource', () => {
         updatedAt
         disable
         closed
-        type
-        user {
-          name
-        }
-        post {
-          title
-        }
-        comment {
-          content
+        to {
+          __typename
+          ... on User {
+            name
+          }
+          ... on Post {
+            title
+          }
+          ... on Comment {
+            content
+          }
         }
         reportsFiled {
           submitter {
@@ -130,14 +132,6 @@ describe('file a report on a resource', () => {
               data: {
                 fileReport: {
                   id: expect.any(String),
-                  createdAt: expect.any(String),
-                  updatedAt: expect.any(String),
-                  disable: false,
-                  closed: false,
-                  user: {
-                    name: 'abusive-user',
-                  },
-                  type: 'User',
                 },
               },
               errors: undefined,
@@ -157,11 +151,11 @@ describe('file a report on a resource', () => {
             expect(firstReport.data.fileReport.id).toEqual(secondReport.data.fileReport.id)
           })
 
-          it.todo('creates multiple reports')
+          it.todo('creates multiple filed reports')
         })
 
         describe('reported resource is a user', () => {
-          it('returns type "User"', async () => {
+          it('returns __typename "User"', async () => {
             await expect(
               mutate({
                 mutation: reportMutation,
@@ -170,29 +164,16 @@ describe('file a report on a resource', () => {
             ).resolves.toMatchObject({
               data: {
                 fileReport: {
-                  id: expect.any(String),
-                  createdAt: expect.any(String),
-                  updatedAt: expect.any(String),
-                  disable: false,
-                  closed: false,
-                  type: 'User',
-                  reportsFiled: [
-                    {
-                      submitter: {
-                        id: 'current-user-id',
-                      },
-                      createdAt: expect.any(String),
-                      reasonCategory: 'other',
-                      reasonDescription: 'Violates code of conduct !!!',
-                    },
-                  ],
+                  to: {
+                    __typename: 'User',
+                  },
                 },
               },
               errors: undefined,
             })
           })
 
-          it('returns resource in user attribute', async () => {
+          it('returns user attribute info', async () => {
             await expect(
               mutate({
                 mutation: reportMutation,
@@ -201,7 +182,8 @@ describe('file a report on a resource', () => {
             ).resolves.toMatchObject({
               data: {
                 fileReport: {
-                  user: {
+                  to: {
+                    __typename: 'User',
                     name: 'abusive-user',
                   },
                 },
@@ -364,7 +346,9 @@ describe('file a report on a resource', () => {
             ).resolves.toMatchObject({
               data: {
                 fileReport: {
-                  type: 'Post',
+                  to: {
+                    __typename: 'Post',
+                  },
                 },
               },
               errors: undefined,
@@ -383,7 +367,8 @@ describe('file a report on a resource', () => {
             ).resolves.toMatchObject({
               data: {
                 fileReport: {
-                  post: {
+                  to: {
+                    __typename: 'Post',
                     title: 'This is a post that is going to be reported',
                   },
                 },
@@ -391,25 +376,6 @@ describe('file a report on a resource', () => {
               errors: undefined,
             })
           })
-
-          it('returns null in user attribute', async () => {
-            await expect(
-              mutate({
-                mutation: reportMutation,
-                variables: {
-                  ...variables,
-                  resourceId: 'post-to-report-id',
-                },
-              }),
-            ).resolves.toMatchObject({
-              data: {
-                fileReport: {
-                  user: null,
-                },
-              },
-              errors: undefined,
-            })
-          })
         })
 
         describe('reported resource is a comment', () => {
@@ -442,7 +408,9 @@ describe('file a report on a resource', () => {
             ).resolves.toMatchObject({
               data: {
                 fileReport: {
-                  type: 'Comment',
+                  to: {
+                    __typename: 'Comment',
+                  },
                 },
               },
               errors: undefined,
@@ -461,7 +429,8 @@ describe('file a report on a resource', () => {
             ).resolves.toMatchObject({
               data: {
                 fileReport: {
-                  comment: {
+                  to: {
+                    __typename: 'Comment',
                     content: 'Post comment to be reported.',
                   },
                 },
@@ -506,15 +475,17 @@ describe('file a report on a resource', () => {
           updatedAt
           disable
           closed
-          type
-          user {
-            id
-          }
-          post {
-            id
-          }
-          comment {
-            id
+          to {
+            __typename
+            ... on User {
+              id
+            }
+            ... on Post {
+              id
+            }
+            ... on Comment {
+              id
+            }
           }
           reportsFiled {
             submitter {
@@ -639,12 +610,10 @@ describe('file a report on a resource', () => {
               updatedAt: expect.any(String),
               disable: false,
               closed: false,
-              type: 'User',
-              user: expect.objectContaining({
+              to: {
+                __typename: 'User',
                 id: 'abusive-user-1',
-              }),
-              post: null,
-              comment: null,
+              },
               reportsFiled: expect.arrayContaining([
                 expect.objectContaining({
                   submitter: expect.objectContaining({
@@ -662,12 +631,10 @@ describe('file a report on a resource', () => {
               updatedAt: expect.any(String),
               disable: false,
               closed: false,
-              type: 'Post',
-              user: null,
-              post: expect.objectContaining({
+              to: {
+                __typename: 'Post',
                 id: 'abusive-post-1',
-              }),
-              comment: null,
+              },
               reportsFiled: expect.arrayContaining([
                 expect.objectContaining({
                   submitter: expect.objectContaining({
@@ -685,12 +652,10 @@ describe('file a report on a resource', () => {
               updatedAt: expect.any(String),
               disable: false,
               closed: false,
-              type: 'Comment',
-              user: null,
-              post: null,
-              comment: expect.objectContaining({
+              to: {
+                __typename: 'Comment',
                 id: 'abusive-comment-1',
-              }),
+              },
               reportsFiled: expect.arrayContaining([
                 expect.objectContaining({
                   submitter: expect.objectContaining({
diff --git a/backend/src/schema/types/type/Report.gql b/backend/src/schema/types/type/Report.gql
index ce4e511f8..6dee7f282 100644
--- a/backend/src/schema/types/type/Report.gql
+++ b/backend/src/schema/types/type/Report.gql
@@ -6,13 +6,12 @@ type Report {
   disable: Boolean!
   closed: Boolean!
   reportsFiled: [FILED]
-  user: User
-  post: Post
-  comment: Comment
+  to: ReportedResource
   type: String
+  reviewedByModerator: User
 }
-# not yet supported
-# union ReportResource = User | Post | Comment
+
+union ReportedResource = User | Post | Comment
 
 enum ReportRule {
   latestReviewUpdatedAtRules

From d18d9228b0057fae22b4b846f9d41f5223cd6e69 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Wed, 27 Nov 2019 17:35:30 +0100
Subject: [PATCH 090/174] Refactor tests/resolvers

- we were making multiple http requests to report resources in this
test, now we are bypassing these requests by setting the database up to
how we want to test, then testing what we want in isolation.
- also added tests for closing a report
- favor union for returning resource
- simplify review mutation
---
 backend/src/schema/resolvers/moderation.js    |  95 +--
 .../src/schema/resolvers/moderation.spec.js   | 723 ++++++++++--------
 backend/src/schema/types/type/REVIEWED.gql    |  16 +-
 3 files changed, 452 insertions(+), 382 deletions(-)

diff --git a/backend/src/schema/resolvers/moderation.js b/backend/src/schema/resolvers/moderation.js
index 9d687dd42..730ff73c3 100644
--- a/backend/src/schema/resolvers/moderation.js
+++ b/backend/src/schema/resolvers/moderation.js
@@ -1,94 +1,45 @@
+const transformReturnType = record => {
+  return {
+    ...record.get('review').properties,
+    report: record.get('report').properties,
+    to: {
+      __typename: record.get('type'),
+      ...record.get('resource').properties,
+    },
+  }
+}
+
 export default {
   Mutation: {
     review: async (_object, params, context, _resolveInfo) => {
-      const { resourceId } = params
-      let { disable, closed } = params
-      disable = disable === undefined ? null : disable
-      closed = closed === undefined ? null : closed
       const { user: moderator, driver } = context
 
       let createdRelationshipWithNestedAttributes = null // return value
-
       const session = driver.session()
       try {
         const cypher = ` 
+            MATCH (resource {id: $params.resourceId})<-[:BELONGS_TO]-(report:Report {closed: false})
             MATCH (moderator:User {id: $moderatorId})
-            MATCH (resource {id: $resourceId})
             WHERE resource:User OR resource:Post OR resource:Comment
-
-            // no open report, create one, update existing
-            MERGE (resource)<-[:BELONGS_TO]-(report:Report {closed: false})
-            ON CREATE SET report.id = randomUUID(), report.createdAt = $dateTime, report.updatedAt = report.createdAt, report.rule = 'latestReviewUpdatedAtRules', report.disable = resource.disabled, report.closed = false
-            ON MATCH SET report.updatedAt = $dateTime
-            // report.disable and report.closed are set after setting them in review
-
-            // Create review on report
-            WITH moderator, resource, report
-            MERGE (report)<-[review:REVIEWED]-(moderator)
-            ON CREATE SET review.createdAt = $dateTime, review.updatedAt = review.createdAt,
-              review.disable = CASE WHEN $disable IS NULL
-                THEN report.disable
-                ELSE $disable END,
-              review.closed = CASE WHEN $closed IS NULL
-                THEN report.closed
-                ELSE $closed END
-            ON MATCH SET
-              review.updatedAt = $dateTime,
-              review.disable = CASE WHEN $disable IS NULL
-                THEN review.disable
-                ELSE $disable END,
-              review.closed = CASE WHEN $closed IS NULL
-                THEN review.closed
-                ELSE $closed END
-
-            SET report.disable = review.disable, report.closed = review.closed
+            MERGE (report)<-[review:REVIEWED { disable: $params.disable, closed: $params.closed }]-(moderator)
+            ON CREATE SET review.createdAt = $dateTime, review.updatedAt = review.createdAt
+            ON MATCH SET review.updatedAt = $dateTime
+            SET report.updatedAt = $dateTime, report.closed = review.closed
             SET resource.disabled = review.disable
 
-            RETURN moderator, review, report, resource, labels(resource)[0] AS type
+            RETURN review, report, resource, labels(resource)[0] AS type
           `
-        const mutateDecisionWriteTxResultPromise = session.writeTransaction(async txc => {
-          const mutateDecisionTransactionResponse = await txc.run(cypher, {
-            resourceId,
+        const reviewWriteTxResultPromise = session.writeTransaction(async txc => {
+          const reviewTransactionResponse = await txc.run(cypher, {
+            params,
             moderatorId: moderator.id,
             dateTime: new Date().toISOString(),
-            disable,
-            closed,
           })
-          return mutateDecisionTransactionResponse.records.map(record => ({
-            moderator: record.get('moderator'),
-            review: record.get('review'),
-            report: record.get('report'),
-            resource: record.get('resource'),
-            type: record.get('type'),
-          }))
+          return reviewTransactionResponse.records.map(transformReturnType)
         })
-        const txResult = await mutateDecisionWriteTxResultPromise
+        const txResult = await reviewWriteTxResultPromise
         if (!txResult[0]) return null
-        const { moderator: moderatorInResult, review, report, resource, type } = txResult[0]
-        createdRelationshipWithNestedAttributes = {
-          ...review.properties,
-          reportId: report.properties.id,
-          reportCreatedAt: report.properties.createdAt,
-          reportUpdatedAt: report.properties.updatedAt,
-          reportDisable: report.properties.disable,
-          reportClosed: report.properties.closed,
-          moderator: moderatorInResult.properties,
-          type,
-          post: null,
-          comment: null,
-          user: null,
-        }
-        switch (type) {
-          case 'Post':
-            createdRelationshipWithNestedAttributes.post = resource.properties
-            break
-          case 'Comment':
-            createdRelationshipWithNestedAttributes.comment = resource.properties
-            break
-          case 'User':
-            createdRelationshipWithNestedAttributes.user = resource.properties
-            break
-        }
+        createdRelationshipWithNestedAttributes = txResult[0]
       } finally {
         session.close()
       }
diff --git a/backend/src/schema/resolvers/moderation.spec.js b/backend/src/schema/resolvers/moderation.spec.js
index 1c056500e..6dd2b41f7 100644
--- a/backend/src/schema/resolvers/moderation.spec.js
+++ b/backend/src/schema/resolvers/moderation.spec.js
@@ -8,63 +8,50 @@ const factory = Factory()
 const neode = getNeode()
 const driver = getDriver()
 
-let query,
-  mutate,
+let mutate,
   authenticatedUser,
   disableVariables,
   enableVariables,
-  resourceVariables,
   moderator,
-  nonModerator
+  nonModerator,
+  closeReportVariables
 
-const reportMutation = gql`
-  mutation($resourceId: ID!, $reasonCategory: ReasonCategory!, $reasonDescription: String!) {
-    fileReport(
-      resourceId: $resourceId
-      reasonCategory: $reasonCategory
-      reasonDescription: $reasonDescription
-    ) {
-      type
-    }
-  }
-`
 const reviewMutation = gql`
   mutation($resourceId: ID!, $disable: Boolean, $closed: Boolean) {
     review(resourceId: $resourceId, disable: $disable, closed: $closed) {
-      post {
-        id
+      createdAt
+      updatedAt
+      to {
+        __typename
+        ... on User {
+          id
+          disabled
+        }
+        ... on Post {
+          id
+          disabled
+        }
+        ... on Comment {
+          id
+          disabled
+        }
       }
-      comment {
-        id
-      }
-    }
-  }
-`
-const commentQuery = gql`
-  query($id: ID!) {
-    Comment(id: $id) {
-      id
-      disabled
-      reviewedByModerator {
-        id
-      }
-    }
-  }
-`
-const postQuery = gql`
-  query($id: ID) {
-    Post(id: $id) {
-      id
-      disabled
-      reviewedByModerator {
+      report {
         id
+        createdAt
+        updatedAt
+        closed
+        reviewedByModerator {
+          id
+        }
       }
     }
   }
 `
 
 describe('moderate resources', () => {
-  beforeAll(() => {
+  beforeAll(async () => {
+    await factory.cleanDatabase()
     authenticatedUser = undefined
     const { server } = createServer({
       context: () => {
@@ -76,13 +63,9 @@ describe('moderate resources', () => {
       },
     })
     mutate = createTestClient(server).mutate
-    query = createTestClient(server).query
   })
 
   beforeEach(async () => {
-    resourceVariables = {
-      id: 'undefined-resource',
-    }
     disableVariables = {
       resourceId: 'undefined-resource',
       disable: true,
@@ -101,12 +84,81 @@ describe('moderate resources', () => {
       password: '1234',
       role: 'moderator',
     })
+    nonModerator = await factory.create('User', {
+      id: 'non-moderator',
+      name: 'Non Moderator',
+      email: 'non.moderator@example.org',
+      password: '1234',
+    })
   })
 
   afterEach(async () => {
     await factory.cleanDatabase()
   })
 
+  describe('review to close report, leaving resource enabled', () => {
+    describe('unauthenticated', () => {
+      it('throws authorization error', async () => {
+        await expect(
+          mutate({ mutation: reviewMutation, variables: disableVariables }),
+        ).resolves.toMatchObject({
+          errors: [{ message: 'Not Authorised!' }],
+        })
+      })
+    })
+
+    describe('authenticated', () => {
+      beforeEach(async () => {
+        authenticatedUser = await nonModerator.toJson()
+      })
+
+      it('non-moderator receives an authorization error', async () => {
+        await expect(
+          mutate({ mutation: reviewMutation, variables: disableVariables }),
+        ).resolves.toMatchObject({
+          errors: [{ message: 'Not Authorised!' }],
+        })
+      })
+    })
+
+    describe('moderator', () => {
+      beforeEach(async () => {
+        authenticatedUser = await moderator.toJson()
+        const questionablePost = await factory.create('Post', {
+          id: 'should-i-be-disabled',
+        })
+        const reportAgainstQuestionablePost = await factory.create('Report')
+        await Promise.all([
+          reportAgainstQuestionablePost.relateTo(nonModerator, 'filed', {
+            resourceId: 'should-i-be-disabled',
+            reasonCategory: 'doxing',
+            reasonDescription: "This shouldn't be shown to anybody else! It's my private thing!",
+          }),
+          reportAgainstQuestionablePost.relateTo(questionablePost, 'belongsTo'),
+        ])
+        closeReportVariables = {
+          resourceId: 'should-i-be-disabled',
+          disable: false,
+          closed: true,
+        }
+      })
+
+      it('report can be closed without disabling resource', async () => {
+        await expect(
+          mutate({ mutation: reviewMutation, variables: closeReportVariables }),
+        ).resolves.toMatchObject({
+          data: {
+            review: {
+              to: { __typename: 'Post', id: 'should-i-be-disabled', disabled: false },
+              report: { id: expect.any(String), closed: true },
+            },
+          },
+          errors: undefined,
+        })
+      })
+    })
+  })
+
   describe('review to disable', () => {
     describe('unauthenticated', () => {
       it('throws authorization error', async () => {
@@ -119,218 +171,256 @@ describe('moderate resources', () => {
     })
 
     describe('authenticated', () => {
-      describe('non moderator', () => {
+      beforeEach(async () => {
+        authenticatedUser = await nonModerator.toJson()
+      })
+
+      it('non-moderator receives an authorization error', async () => {
+        await expect(
+          mutate({ mutation: reviewMutation, variables: disableVariables }),
+        ).resolves.toMatchObject({
+          errors: [{ message: 'Not Authorised!' }],
+        })
+      })
+    })
+
+    describe('moderator', () => {
+      beforeEach(async () => {
+        authenticatedUser = await moderator.toJson()
+      })
+
+      describe('review of a resource that is not a (Comment|Post|User) ', () => {
         beforeEach(async () => {
-          nonModerator = await factory.create('User', {
-            id: 'non-moderator',
-            name: 'Non Moderator',
-            email: 'non.moderator@example.org',
-            password: '1234',
-          })
-          authenticatedUser = await nonModerator.toJson()
+          disableVariables = {
+            ...disableVariables,
+            resourceId: 'tag-id',
+          }
+          await factory.create('Tag', { id: 'tag-id' })
         })
 
-        it('throws authorization error', async () => {
+        it('returns null', async () => {
           await expect(
             mutate({ mutation: reviewMutation, variables: disableVariables }),
           ).resolves.toMatchObject({
-            errors: [{ message: 'Not Authorised!' }],
+            data: { review: null },
           })
         })
       })
 
-      describe('moderator', () => {
+      describe('moderate a comment', () => {
         beforeEach(async () => {
-          authenticatedUser = await moderator.toJson()
+          const trollingComment = await factory.create('Comment', {
+            id: 'comment-id',
+          })
+          const reportAgainstTrollingComment = await factory.create('Report')
+          await Promise.all([
+            reportAgainstTrollingComment.relateTo(nonModerator, 'filed', {
+              resourceId: 'comment-id',
+              reasonCategory: 'other',
+              reasonDescription: 'This comment is bigoted',
+            }),
+            reportAgainstTrollingComment.relateTo(trollingComment, 'belongsTo'),
+          ])
+          disableVariables = {
+            ...disableVariables,
+            resourceId: 'comment-id',
+          }
         })
 
-        describe('moderate a resource that is not a (Comment|Post|User) ', () => {
-          beforeEach(async () => {
-            disableVariables = {
-              ...disableVariables,
-              resourceId: 'sample-tag-id',
-            }
-            await factory.create('Tag', { id: 'sample-tag-id' })
-          })
-
-          it('returns null', async () => {
-            await expect(
-              mutate({ mutation: reviewMutation, variables: disableVariables }),
-            ).resolves.toMatchObject({
-              data: { review: null },
-            })
+        it('returns disabled resource id', async () => {
+          await expect(
+            mutate({ mutation: reviewMutation, variables: disableVariables }),
+          ).resolves.toMatchObject({
+            data: { review: { to: { __typename: 'Comment', id: 'comment-id' } } },
+            errors: undefined,
           })
         })
 
-        describe('moderate a comment', () => {
-          beforeEach(async () => {
-            await factory.create('Comment', {
-              id: 'comment-id',
-            })
-            await mutate({
-              mutation: reportMutation,
-              variables: {
-                resourceId: 'comment-id',
-                reasonCategory: 'discrimination_etc',
-                reasonDescription: 'I am what I am !!!',
+        it('returns .reviewedByModerator', async () => {
+          await expect(
+            mutate({ mutation: reviewMutation, variables: disableVariables }),
+          ).resolves.toMatchObject({
+            data: {
+              review: {
+                to: { __typename: 'Comment', id: 'comment-id' },
+                report: { id: expect.any(String), reviewedByModerator: { id: 'moderator-id' } },
               },
-            })
-          })
-
-          it('returns disabled resource id', async () => {
-            disableVariables = {
-              ...disableVariables,
-              resourceId: 'comment-id',
-            }
-            await expect(
-              mutate({ mutation: reviewMutation, variables: disableVariables }),
-            ).resolves.toMatchObject({
-              data: { review: { comment: { id: 'comment-id' } } },
-              errors: undefined,
-            })
-          })
-
-          it('changes .reviewedByModerator', async () => {
-            resourceVariables = {
-              id: 'comment-id',
-            }
-            disableVariables = {
-              ...disableVariables,
-              resourceId: 'comment-id',
-            }
-            const before = { data: { Comment: [{ id: 'comment-id', reviewedByModerator: null }] } }
-            const expected = {
-              data: {
-                Comment: [{ id: 'comment-id', reviewedByModerator: { id: 'moderator-id' } }],
-              },
-            }
-            await expect(
-              query({ query: commentQuery, variables: resourceVariables }),
-            ).resolves.toMatchObject(before)
-            await expect(
-              mutate({ mutation: reviewMutation, variables: disableVariables }),
-            ).resolves.toMatchObject({
-              data: { review: { comment: { id: 'comment-id' } } },
-            })
-            await expect(
-              query({ query: commentQuery, variables: resourceVariables }),
-            ).resolves.toMatchObject(expected)
-          })
-
-          it('updates .disabled on comment', async () => {
-            resourceVariables = {
-              id: 'comment-id',
-            }
-            disableVariables = {
-              ...disableVariables,
-              resourceId: 'comment-id',
-            }
-            const before = { data: { Comment: [{ id: 'comment-id', disabled: false }] } }
-            const expected = { data: { Comment: [{ id: 'comment-id', disabled: true }] } }
-
-            await expect(
-              query({ query: commentQuery, variables: resourceVariables }),
-            ).resolves.toMatchObject(before)
-            await expect(
-              mutate({ mutation: reviewMutation, variables: disableVariables }),
-            ).resolves.toMatchObject({
-              data: { review: { comment: { id: 'comment-id' } } },
-            })
-            await expect(
-              query({ query: commentQuery, variables: resourceVariables }),
-            ).resolves.toMatchObject(expected)
+            },
           })
         })
 
-        describe('moderate a post', () => {
-          beforeEach(async () => {
-            await factory.create('Post', {
-              id: 'sample-post-id',
-            })
-            await mutate({
-              mutation: reportMutation,
-              variables: {
-                resourceId: 'sample-post-id',
-                reasonCategory: 'discrimination_etc',
-                reasonDescription: 'I am what I am !!!',
+        it('updates .disabled on comment', async () => {
+          await expect(
+            mutate({ mutation: reviewMutation, variables: disableVariables }),
+          ).resolves.toMatchObject({
+            data: { review: { to: { __typename: 'Comment', id: 'comment-id', disabled: true } } },
+          })
+        })
+
+        it('can be closed with one review', async () => {
+          closeReportVariables = {
+            ...disableVariables,
+            closed: true,
+          }
+          await expect(
+            mutate({ mutation: reviewMutation, variables: closeReportVariables }),
+          ).resolves.toMatchObject({
+            data: {
+              review: {
+                to: { __typename: 'Comment', id: 'comment-id' },
+                report: { id: expect.any(String), closed: true },
               },
-            })
+            },
           })
+        })
+      })
 
-          it('returns disabled resource id', async () => {
-            disableVariables = {
-              ...disableVariables,
-              resourceId: 'sample-post-id',
-            }
-            await expect(
-              mutate({ mutation: reviewMutation, variables: disableVariables }),
-            ).resolves.toMatchObject({
-              data: { review: { post: { id: 'sample-post-id' } } },
-            })
+      describe('moderate a post', () => {
+        beforeEach(async () => {
+          const trollingPost = await factory.create('Post', {
+            id: 'post-id',
           })
+          const reportAgainstTrollingPost = await factory.create('Report')
+          await Promise.all([
+            reportAgainstTrollingPost.relateTo(nonModerator, 'filed', {
+              resourceId: 'post-id',
+              reasonCategory: 'doxing',
+              reasonDescription: "This shouldn't be shown to anybody else! It's my private thing!",
+            }),
+            reportAgainstTrollingPost.relateTo(trollingPost, 'belongsTo'),
+          ])
+          disableVariables = {
+            ...disableVariables,
+            resourceId: 'post-id',
+          }
+        })
 
-          it('changes .reviewedByModerator', async () => {
-            resourceVariables = {
-              id: 'sample-post-id',
-            }
-            disableVariables = {
-              ...disableVariables,
-              resourceId: 'sample-post-id',
-            }
-            const before = { data: { Post: [{ id: 'sample-post-id', reviewedByModerator: null }] } }
-            const expected = {
-              data: {
-                Post: [{ id: 'sample-post-id', reviewedByModerator: { id: 'moderator-id' } }],
+        it('returns disabled resource id', async () => {
+          await expect(
+            mutate({ mutation: reviewMutation, variables: disableVariables }),
+          ).resolves.toMatchObject({
+            data: {
+              review: {
+                to: { __typename: 'Post', id: 'post-id' },
               },
-            }
-
-            await expect(
-              query({ query: postQuery, variables: resourceVariables }),
-            ).resolves.toMatchObject(before)
-            await expect(
-              mutate({ mutation: reviewMutation, variables: disableVariables }),
-            ).resolves.toMatchObject({
-              data: { review: { post: { id: 'sample-post-id' } } },
-            })
-            await expect(
-              query({ query: postQuery, variables: resourceVariables }),
-            ).resolves.toMatchObject(expected)
+            },
           })
+        })
 
-          it('updates .disabled on post', async () => {
-            resourceVariables = {
-              id: 'sample-post-id',
-            }
-            disableVariables = {
-              ...disableVariables,
-              resourceId: 'sample-post-id',
-            }
-            const before = { data: { Post: [{ id: 'sample-post-id', disabled: false }] } }
-            const expected = { data: { Post: [{ id: 'sample-post-id', disabled: true }] } }
+        it('returns .reviewedByModerator', async () => {
+          await expect(
+            mutate({ mutation: reviewMutation, variables: disableVariables }),
+          ).resolves.toMatchObject({
+            data: {
+              review: {
+                to: { __typename: 'Post', id: 'post-id' },
+                report: { id: expect.any(String), reviewedByModerator: { id: 'moderator-id' } },
+              },
+            },
+          })
+        })
 
-            await expect(
-              query({ query: postQuery, variables: resourceVariables }),
-            ).resolves.toMatchObject(before)
-            await expect(
-              mutate({ mutation: reviewMutation, variables: disableVariables }),
-            ).resolves.toMatchObject({
-              data: { review: { post: { id: 'sample-post-id' } } },
-            })
-            await expect(
-              query({ query: postQuery, variables: resourceVariables }),
-            ).resolves.toMatchObject(expected)
+        it('updates .disabled on post', async () => {
+          await expect(
+            mutate({ mutation: reviewMutation, variables: disableVariables }),
+          ).resolves.toMatchObject({
+            data: { review: { to: { __typename: 'Post', id: 'post-id', disabled: true } } },
+          })
+        })
+
+        it('can be closed with one review', async () => {
+          closeReportVariables = {
+            ...disableVariables,
+            closed: true,
+          }
+          await expect(
+            mutate({ mutation: reviewMutation, variables: closeReportVariables }),
+          ).resolves.toMatchObject({
+            data: {
+              review: {
+                to: { __typename: 'Post', id: 'post-id' },
+                report: { id: expect.any(String), closed: true },
+              },
+            },
+          })
+        })
+      })
+
+      describe('moderate a user', () => {
+        beforeEach(async () => {
+          const troll = await factory.create('User', {
+            id: 'user-id',
+          })
+          const reportAgainstTroll = await factory.create('Report')
+          await Promise.all([
+            reportAgainstTroll.relateTo(nonModerator, 'filed', {
+              resourceId: 'user-id',
+              reasonCategory: 'discrimination_etc',
+              reasonDescription: 'This user is harassing me with bigoted remarks!',
+            }),
+            reportAgainstTroll.relateTo(troll, 'belongsTo'),
+          ])
+          disableVariables = {
+            ...disableVariables,
+            resourceId: 'user-id',
+          }
+        })
+
+        it('returns disabled resource id', async () => {
+          await expect(
+            mutate({ mutation: reviewMutation, variables: disableVariables }),
+          ).resolves.toMatchObject({
+            data: { review: { to: { __typename: 'User', id: 'user-id' } } },
+          })
+        })
+
+        it('returns .reviewedByModerator', async () => {
+          await expect(
+            mutate({ mutation: reviewMutation, variables: disableVariables }),
+          ).resolves.toMatchObject({
+            data: {
+              review: {
+                to: { __typename: 'User', id: 'user-id' },
+                report: { id: expect.any(String), reviewedByModerator: { id: 'moderator-id' } },
+              },
+            },
+          })
+        })
+
+        it('updates .disabled on user', async () => {
+          await expect(
+            mutate({ mutation: reviewMutation, variables: disableVariables }),
+          ).resolves.toMatchObject({
+            data: { review: { to: { __typename: 'User', id: 'user-id', disabled: true } } },
+          })
+        })
+
+        it('can be closed with one review', async () => {
+          closeReportVariables = {
+            ...disableVariables,
+            closed: true,
+          }
+          await expect(
+            mutate({ mutation: reviewMutation, variables: closeReportVariables }),
+          ).resolves.toMatchObject({
+            data: {
+              review: {
+                to: { __typename: 'User', id: 'user-id' },
+                report: { id: expect.any(String), closed: true },
+              },
+            },
           })
         })
       })
     })
   })
 
-  describe('enable', () => {
+  describe('review to re-enable after disabled', () => {
     describe('unautenticated user', () => {
       it('throws authorization error', async () => {
         enableVariables = {
           ...enableVariables,
-          resourceId: 'sample-post-id',
+          resourceId: 'post-id',
         }
         await expect(
           mutate({ mutation: reviewMutation, variables: enableVariables }),
@@ -343,19 +433,13 @@ describe('moderate resources', () => {
     describe('authenticated user', () => {
       describe('non moderator', () => {
         beforeEach(async () => {
-          nonModerator = await factory.create('User', {
-            id: 'non-moderator',
-            name: 'Non Moderator',
-            email: 'non.moderator@example.org',
-            password: '1234',
-          })
           authenticatedUser = await nonModerator.toJson()
         })
 
         it('throws authorization error', async () => {
           enableVariables = {
             ...enableVariables,
-            resourceId: 'sample-post-id',
+            resourceId: 'post-id',
           }
           await expect(
             mutate({ mutation: reviewMutation, variables: enableVariables }),
@@ -372,13 +456,13 @@ describe('moderate resources', () => {
 
         describe('moderate a resource that is not a (Comment|Post|User) ', () => {
           beforeEach(async () => {
-            await Promise.all([factory.create('Tag', { id: 'sample-tag-id' })])
+            await Promise.all([factory.create('Tag', { id: 'tag-id' })])
           })
 
           it('returns null', async () => {
             enableVariables = {
               ...enableVariables,
-              resourceId: 'sample-tag-id',
+              resourceId: 'tag-id',
             }
             await expect(
               mutate({ mutation: reviewMutation, variables: enableVariables }),
@@ -390,132 +474,175 @@ describe('moderate resources', () => {
 
         describe('moderate a comment', () => {
           beforeEach(async () => {
-            resourceVariables = {
+            const trollingComment = await factory.create('Comment', {
               id: 'comment-id',
-            }
-            disableVariables = {
-              ...disableVariables,
-              resourceId: 'comment-id',
-            }
+            })
+            const reportAgainstTrollingComment = await factory.create('Report')
+            await Promise.all([
+              reportAgainstTrollingComment.relateTo(nonModerator, 'filed', {
+                resourceId: 'comment-id',
+                reasonCategory: 'other',
+                reasonDescription: 'This comment is bigoted',
+              }),
+              reportAgainstTrollingComment.relateTo(trollingComment, 'belongsTo'),
+            ])
+            await Promise.all([
+              reportAgainstTrollingComment.relateTo(moderator, 'reviewed', {
+                ...disableVariables,
+                resourceId: 'comment-id',
+              }),
+              trollingComment.update({ disabled: true, updatedAt: new Date().toISOString() }),
+            ])
             enableVariables = {
               ...enableVariables,
               resourceId: 'comment-id',
             }
-            await factory.create('Comment', {
-              id: 'comment-id',
-            })
-            await mutate({
-              mutation: reportMutation,
-              variables: {
-                resourceId: 'comment-id',
-                reasonCategory: 'discrimination_etc',
-                reasonDescription: 'I am what I am !!!',
-              },
-            })
-            await mutate({ mutation: reviewMutation, variables: disableVariables })
           })
 
           it('returns enabled resource id', async () => {
             await expect(
               mutate({ mutation: reviewMutation, variables: enableVariables }),
             ).resolves.toMatchObject({
-              data: { review: { comment: { id: 'comment-id' } } },
+              data: { review: { to: { __typename: 'Comment', id: 'comment-id' } } },
             })
           })
 
-          it('changes .reviewedByModerator', async () => {
-            const expected = {
-              data: {
-                Comment: [{ id: 'comment-id', reviewedByModerator: { id: 'moderator-id' } }],
-              },
-            }
-
+          it('returns .reviewedByModerator', async () => {
             await expect(
               mutate({ mutation: reviewMutation, variables: enableVariables }),
             ).resolves.toMatchObject({
-              data: { review: { comment: { id: 'comment-id' } } },
+              data: {
+                review: {
+                  to: { __typename: 'Comment', id: 'comment-id' },
+                  report: { id: expect.any(String), reviewedByModerator: { id: 'moderator-id' } },
+                },
+              },
             })
-            await expect(
-              query({ query: commentQuery, variables: resourceVariables }),
-            ).resolves.toMatchObject(expected)
           })
 
           it('updates .disabled on comment', async () => {
-            const expected = {
-              data: { Comment: [{ id: 'comment-id', disabled: false }] },
-            }
-
             await expect(
               mutate({ mutation: reviewMutation, variables: enableVariables }),
             ).resolves.toMatchObject({
-              data: { review: { comment: { id: 'comment-id' } } },
+              data: {
+                review: { to: { __typename: 'Comment', id: 'comment-id', disabled: false } },
+              },
             })
-            await expect(
-              query({ query: commentQuery, variables: resourceVariables }),
-            ).resolves.toMatchObject(expected)
           })
         })
 
         describe('moderate a post', () => {
           beforeEach(async () => {
-            resourceVariables = { id: 'post-id' }
-            disableVariables = {
-              ...disableVariables,
-              resourceId: 'post-id',
-            }
+            const trollingPost = await factory.create('Post', {
+              id: 'post-id',
+            })
+            const reportAgainstTrollingPost = await factory.create('Report')
+            await Promise.all([
+              reportAgainstTrollingPost.relateTo(nonModerator, 'filed', {
+                resourceId: 'post-id',
+                reasonCategory: 'doxing',
+                reasonDescription:
+                  "This shouldn't be shown to anybody else! It's my private thing!",
+              }),
+              reportAgainstTrollingPost.relateTo(trollingPost, 'belongsTo'),
+            ])
+            await Promise.all([
+              reportAgainstTrollingPost.relateTo(moderator, 'reviewed', {
+                ...disableVariables,
+                resourceId: 'comment-id',
+              }),
+              trollingPost.update({ disabled: true, updatedAt: new Date().toISOString() }),
+            ])
             enableVariables = {
               ...enableVariables,
               resourceId: 'post-id',
             }
-            await factory.create('Post', {
-              id: 'post-id',
-            })
-            await mutate({
-              mutation: reportMutation,
-              variables: {
-                resourceId: 'post-id',
-                reasonCategory: 'discrimination_etc',
-                reasonDescription: 'I am what I am !!!',
-              },
-            })
-            await mutate({ mutation: reviewMutation, variables: disableVariables })
           })
 
           it('returns enabled resource id', async () => {
             await expect(
               mutate({ mutation: reviewMutation, variables: enableVariables }),
             ).resolves.toMatchObject({
-              data: { review: { post: { id: 'post-id' } } },
+              data: { review: { to: { __typename: 'Post', id: 'post-id' } } },
             })
           })
 
-          it('changes .reviewedByModerator', async () => {
-            const expected = {
-              data: { Post: [{ id: 'post-id', reviewedByModerator: { id: 'moderator-id' } }] },
-            }
+          it('returns .reviewedByModerator', async () => {
             await expect(
               mutate({ mutation: reviewMutation, variables: enableVariables }),
             ).resolves.toMatchObject({
-              data: { review: { post: { id: 'post-id' } } },
+              data: {
+                review: {
+                  to: { __typename: 'Post', id: 'post-id' },
+                  report: { id: expect.any(String), reviewedByModerator: { id: 'moderator-id' } },
+                },
+              },
             })
-            await expect(
-              query({ query: postQuery, variables: resourceVariables }),
-            ).resolves.toMatchObject(expected)
           })
 
           it('updates .disabled on post', async () => {
-            const expected = {
-              data: { Post: [{ id: 'post-id', disabled: false }] },
-            }
-
             await expect(
               mutate({ mutation: reviewMutation, variables: enableVariables }),
             ).resolves.toMatchObject({
-              data: { review: { post: { id: 'post-id' } } },
+              data: { review: { to: { __typename: 'Post', id: 'post-id', disabled: false } } },
             })
+          })
+        })
+
+        describe('moderate a user', () => {
+          beforeEach(async () => {
+            const troll = await factory.create('User', {
+              id: 'user-id',
+            })
+            const reportAgainstTroll = await factory.create('Report')
+            await Promise.all([
+              reportAgainstTroll.relateTo(nonModerator, 'filed', {
+                resourceId: 'user-id',
+                reasonCategory: 'discrimination_etc',
+                reasonDescription: 'This user is harassing me with bigoted remarks!',
+              }),
+              reportAgainstTroll.relateTo(troll, 'belongsTo'),
+            ])
+            await Promise.all([
+              reportAgainstTroll.relateTo(moderator, 'reviewed', {
+                ...disableVariables,
+                resourceId: 'comment-id',
+              }),
+              troll.update({ disabled: true, updatedAt: new Date().toISOString() }),
+            ])
+            enableVariables = {
+              ...enableVariables,
+              resourceId: 'user-id',
+            }
+          })
+
+          it('returns enabled resource id', async () => {
             await expect(
-              query({ query: postQuery, variables: resourceVariables }),
-            ).resolves.toMatchObject(expected)
+              mutate({ mutation: reviewMutation, variables: enableVariables }),
+            ).resolves.toMatchObject({
+              data: { review: { to: { __typename: 'User', id: 'user-id' } } },
+            })
+          })
+
+          it('returns .reviewedByModerator', async () => {
+            await expect(
+              mutate({ mutation: reviewMutation, variables: enableVariables }),
+            ).resolves.toMatchObject({
+              data: {
+                review: {
+                  to: { __typename: 'User', id: 'user-id' },
+                  report: { id: expect.any(String), reviewedByModerator: { id: 'moderator-id' } },
+                },
+              },
+            })
+          })
+
+          it('updates .disabled on user', async () => {
+            await expect(
+              mutate({ mutation: reviewMutation, variables: enableVariables }),
+            ).resolves.toMatchObject({
+              data: { review: { to: { __typename: 'User', id: 'user-id', disabled: false } } },
+            })
           })
         })
       })
diff --git a/backend/src/schema/types/type/REVIEWED.gql b/backend/src/schema/types/type/REVIEWED.gql
index c296483ea..5b4a392ae 100644
--- a/backend/src/schema/types/type/REVIEWED.gql
+++ b/backend/src/schema/types/type/REVIEWED.gql
@@ -1,23 +1,15 @@
 type REVIEWED {
   createdAt: String!
   updatedAt: String!
-  # reasonCategory: ReasonCategory
-  # reasonDescription: String
   disable: Boolean!
   closed: Boolean!
-
-  reportId: ID!
-  reportCreatedAt: String!
-  reportUpdatedAt: String!
-  reportDisable: Boolean!
-  reportClosed: Boolean!
-  
+  report: Report
+    # @cypher(statement: "MATCH (report:Report)<-[this:REVIEWED]-(:User) RETURN report")
   moderator: User
   type: String
-  user: User
-  post: Post
-  comment: Comment
+  to: ReviewedResource
 }
+union ReviewedResource = User | Post | Comment
 
 type Mutation {
   review(resourceId: ID!, disable: Boolean, closed: Boolean): REVIEWED

From c6f16497faf46742565870879f7fb77fa57977c2 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Wed, 27 Nov 2019 17:45:05 +0100
Subject: [PATCH 091/174] Update Post slug to be non-nullable

---
 backend/src/schema/types/type/Post.gql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/schema/types/type/Post.gql b/backend/src/schema/types/type/Post.gql
index fd387981d..f034926da 100644
--- a/backend/src/schema/types/type/Post.gql
+++ b/backend/src/schema/types/type/Post.gql
@@ -113,7 +113,7 @@ type Post {
   objectId: String
   author: User @relation(name: "WROTE", direction: "IN")
   title: String!
-  slug: String
+  slug: String!
   content: String!
   contentExcerpt: String
   image: String

From 1f7d8a023e227880f72a29ed1c8f5a2c396cbfc5 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Wed, 27 Nov 2019 17:45:32 +0100
Subject: [PATCH 092/174] Update reports query in frontend

---
 webapp/graphql/Moderation.js      | 112 +++++++++++-------------------
 webapp/pages/moderation/index.vue |   3 +-
 2 files changed, 43 insertions(+), 72 deletions(-)

diff --git a/webapp/graphql/Moderation.js b/webapp/graphql/Moderation.js
index ab6edccc2..d26dfbf8b 100644
--- a/webapp/graphql/Moderation.js
+++ b/webapp/graphql/Moderation.js
@@ -5,34 +5,14 @@ export const reportListQuery = () => {
   return gql`
     query {
       reports(orderBy: createdAt_desc) {
+        id
         createdAt
-        reasonCategory
-        reasonDescription
-        report {
-          id
-          createdAt
-          updatedAt
-          disable
-          closed
-        }
-        type
-        submitter {
-          id
-          slug
-          name
-          disabled
-          deleted
-          followedByCount
-          contributionsCount
-          commentedCount
-        }
-        user {
-          id
-          slug
-          name
-          disabled
-          deleted
-          reviewedByModerator {
+        updatedAt
+        disable
+        closed
+        to {
+          __typename
+          ... on User {
             id
             slug
             name
@@ -42,60 +22,49 @@ export const reportListQuery = () => {
             contributionsCount
             commentedCount
           }
-          followedByCount
-          contributionsCount
-          commentedCount
-        }
-        comment {
-          id
-          contentExcerpt
-          disabled
-          deleted
-          author {
+          ... on Comment {
             id
-            slug
-            name
+            contentExcerpt
             disabled
             deleted
-            followedByCount
-            contributionsCount
-            commentedCount
+            author {
+              id
+              slug
+              name
+              disabled
+              deleted
+              followedByCount
+              contributionsCount
+              commentedCount
+            }
+            post {
+              id
+              slug
+              title
+              disabled
+              deleted
+            }
           }
-          post {
+          ... on Post {
             id
             slug
             title
             disabled
             deleted
-          }
-          reviewedByModerator {
-            id
-            slug
-            name
-            disabled
-            deleted
-            followedByCount
-            contributionsCount
-            commentedCount
+            author {
+              id
+              slug
+              name
+              disabled
+              deleted
+              followedByCount
+              contributionsCount
+              commentedCount
+            }
           }
         }
-        post {
-          id
-          slug
-          title
-          disabled
-          deleted
-          author {
-            id
-            slug
-            name
-            disabled
-            deleted
-            followedByCount
-            contributionsCount
-            commentedCount
-          }
-          reviewedByModerator {
+        reportsFiled {
+          submitter {
             id
             slug
             name
@@ -105,6 +74,9 @@ export const reportListQuery = () => {
             contributionsCount
             commentedCount
           }
+          createdAt
+          reasonCategory
+          reasonDescription
         }
       }
     }
diff --git a/webapp/pages/moderation/index.vue b/webapp/pages/moderation/index.vue
index 1c92610a5..23699ef39 100644
--- a/webapp/pages/moderation/index.vue
+++ b/webapp/pages/moderation/index.vue
@@ -386,8 +386,7 @@ export default {
         return {}
       },
       update({ reports }) {
-        console.log(reports)
-        // this.resourcesClaims = reports
+        this.reports = reports
       },
       fetchPolicy: 'cache-and-network',
     },

From 1f52c73324ec11aea4915d24efbd736dd87268cc Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 27 Nov 2019 17:16:21 +0000
Subject: [PATCH 093/174] build(deps-dev): bump @babel/core from 7.7.2 to 7.7.4
 in /backend

Bumps [@babel/core](https://github.com/babel/babel) from 7.7.2 to 7.7.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.7.2...v7.7.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 backend/package.json |   2 +-
 backend/yarn.lock    | 106 +++++++++----------------------------------
 2 files changed, 23 insertions(+), 85 deletions(-)

diff --git a/backend/package.json b/backend/package.json
index a840d5d92..b12bc2670 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -100,7 +100,7 @@
   },
   "devDependencies": {
     "@babel/cli": "~7.7.0",
-    "@babel/core": "~7.7.2",
+    "@babel/core": "~7.7.4",
     "@babel/node": "~7.7.4",
     "@babel/plugin-proposal-throw-expressions": "^7.7.4",
     "@babel/preset-env": "~7.7.4",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index b4e943562..796ddb442 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -56,18 +56,18 @@
   dependencies:
     "@babel/highlight" "^7.0.0"
 
-"@babel/core@^7.1.0", "@babel/core@~7.7.2":
-  version "7.7.2"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.7.2.tgz#ea5b99693bcfc058116f42fa1dd54da412b29d91"
-  integrity sha512-eeD7VEZKfhK1KUXGiyPFettgF3m513f8FoBSWiQ1xTvl1RAopLs42Wp9+Ze911I6H0N9lNqJMDgoZT7gHsipeQ==
+"@babel/core@^7.1.0", "@babel/core@~7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.7.4.tgz#37e864532200cb6b50ee9a4045f5f817840166ab"
+  integrity sha512-+bYbx56j4nYBmpsWtnPUsKW3NdnYxbqyfrP2w9wILBuHzdfIKz9prieZK0DFPyIzkjYVUe4QkusGL07r5pXznQ==
   dependencies:
     "@babel/code-frame" "^7.5.5"
-    "@babel/generator" "^7.7.2"
-    "@babel/helpers" "^7.7.0"
-    "@babel/parser" "^7.7.2"
-    "@babel/template" "^7.7.0"
-    "@babel/traverse" "^7.7.2"
-    "@babel/types" "^7.7.2"
+    "@babel/generator" "^7.7.4"
+    "@babel/helpers" "^7.7.4"
+    "@babel/parser" "^7.7.4"
+    "@babel/template" "^7.7.4"
+    "@babel/traverse" "^7.7.4"
+    "@babel/types" "^7.7.4"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     json5 "^2.1.0"
@@ -76,17 +76,7 @@
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/generator@^7.4.0", "@babel/generator@^7.7.2":
-  version "7.7.2"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.7.2.tgz#2f4852d04131a5e17ea4f6645488b5da66ebf3af"
-  integrity sha512-WthSArvAjYLz4TcbKOi88me+KmDJdKSlfwwN8CnUYn9jBkzhq0ZEPuBfkAWIvjJ3AdEV1Cf/+eSQTnp3IDJKlQ==
-  dependencies:
-    "@babel/types" "^7.7.2"
-    jsesc "^2.5.1"
-    lodash "^4.17.13"
-    source-map "^0.5.0"
-
-"@babel/generator@^7.7.4":
+"@babel/generator@^7.4.0", "@babel/generator@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.7.4.tgz#db651e2840ca9aa66f327dcec1dc5f5fa9611369"
   integrity sha512-m5qo2WgdOJeyYngKImbkyQrnUN1mPceaG5BV+G0E3gWsa4l/jCSryWJdM2x8OuGAOyh+3d5pVYfZWCiNFtynxg==
@@ -145,15 +135,6 @@
     "@babel/traverse" "^7.7.4"
     "@babel/types" "^7.7.4"
 
-"@babel/helper-function-name@^7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.7.0.tgz#44a5ad151cfff8ed2599c91682dda2ec2c8430a3"
-  integrity sha512-tDsJgMUAP00Ugv8O2aGEua5I2apkaQO7lBGUq1ocwN3G23JE5Dcq0uh3GvFTChPa4b40AWiAsLvCZOA2rdnQ7Q==
-  dependencies:
-    "@babel/helper-get-function-arity" "^7.7.0"
-    "@babel/template" "^7.7.0"
-    "@babel/types" "^7.7.0"
-
 "@babel/helper-function-name@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.7.4.tgz#ab6e041e7135d436d8f0a3eca15de5b67a341a2e"
@@ -163,13 +144,6 @@
     "@babel/template" "^7.7.4"
     "@babel/types" "^7.7.4"
 
-"@babel/helper-get-function-arity@^7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.0.tgz#c604886bc97287a1d1398092bc666bc3d7d7aa2d"
-  integrity sha512-tLdojOTz4vWcEnHWHCuPN5P85JLZWbm5Fx5ZsMEMPhF3Uoe3O7awrbM2nQ04bDOUToH/2tH/ezKEOR8zEYzqyw==
-  dependencies:
-    "@babel/types" "^7.7.0"
-
 "@babel/helper-get-function-arity@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.4.tgz#cb46348d2f8808e632f0ab048172130e636005f0"
@@ -258,13 +232,6 @@
     "@babel/template" "^7.7.4"
     "@babel/types" "^7.7.4"
 
-"@babel/helper-split-export-declaration@^7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.7.0.tgz#1365e74ea6c614deeb56ebffabd71006a0eb2300"
-  integrity sha512-HgYSI8rH08neWlAH3CcdkFg9qX9YsZysZI5GD8LjhQib/mM0jGOZOVkoUiiV2Hu978fRtjtsGsW6w0pKHUWtqA==
-  dependencies:
-    "@babel/types" "^7.7.0"
-
 "@babel/helper-split-export-declaration@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.7.4.tgz#57292af60443c4a3622cf74040ddc28e68336fd8"
@@ -282,14 +249,14 @@
     "@babel/traverse" "^7.7.4"
     "@babel/types" "^7.7.4"
 
-"@babel/helpers@^7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.7.0.tgz#359bb5ac3b4726f7c1fde0ec75f64b3f4275d60b"
-  integrity sha512-VnNwL4YOhbejHb7x/b5F39Zdg5vIQpUUNzJwx0ww1EcVRt41bbGRZWhAURrfY32T5zTT3qwNOQFWpn+P0i0a2g==
+"@babel/helpers@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.7.4.tgz#62c215b9e6c712dadc15a9a0dcab76c92a940302"
+  integrity sha512-ak5NGZGJ6LV85Q1Zc9gn2n+ayXOizryhjSUBTdu5ih1tlVCJeuQENzc4ItyCVhINVXvIT/ZQ4mheGIsfBkpskg==
   dependencies:
-    "@babel/template" "^7.7.0"
-    "@babel/traverse" "^7.7.0"
-    "@babel/types" "^7.7.0"
+    "@babel/template" "^7.7.4"
+    "@babel/traverse" "^7.7.4"
+    "@babel/types" "^7.7.4"
 
 "@babel/highlight@^7.0.0":
   version "7.5.0"
@@ -313,12 +280,7 @@
     regenerator-runtime "^0.13.3"
     v8flags "^3.1.1"
 
-"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.4.3", "@babel/parser@^7.7.0", "@babel/parser@^7.7.2":
-  version "7.7.2"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.7.2.tgz#ea8334dc77416bfd9473eb470fd00d8245b3943b"
-  integrity sha512-DDaR5e0g4ZTb9aP7cpSZLkACEBdoLGwJDWgHtBhrGX7Q1RjhdoMOfexICj5cqTAtpowjGQWfcvfnQG7G2kAB5w==
-
-"@babel/parser@^7.7.4":
+"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.4.3", "@babel/parser@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.7.4.tgz#75ab2d7110c2cf2fa949959afb05fa346d2231bb"
   integrity sha512-jIwvLO0zCL+O/LmEJQjWA75MQTWwx3c3u2JOTDK5D3/9egrWRRA0/0hk9XXywYnXZVVpzrBYeIQTmhwUaePI9g==
@@ -756,16 +718,7 @@
   dependencies:
     regenerator-runtime "^0.13.2"
 
-"@babel/template@^7.4.0", "@babel/template@^7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.7.0.tgz#4fadc1b8e734d97f56de39c77de76f2562e597d0"
-  integrity sha512-OKcwSYOW1mhWbnTBgQY5lvg1Fxg+VyfQGjcBduZFljfc044J5iDlnDSfhQ867O17XHiSCxYHUxHg2b7ryitbUQ==
-  dependencies:
-    "@babel/code-frame" "^7.0.0"
-    "@babel/parser" "^7.7.0"
-    "@babel/types" "^7.7.0"
-
-"@babel/template@^7.7.4":
+"@babel/template@^7.4.0", "@babel/template@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.7.4.tgz#428a7d9eecffe27deac0a98e23bf8e3675d2a77b"
   integrity sha512-qUzihgVPguAzXCK7WXw8pqs6cEwi54s3E+HrejlkuWO6ivMKx9hZl3Y2fSXp9i5HgyWmj7RKP+ulaYnKM4yYxw==
@@ -774,22 +727,7 @@
     "@babel/parser" "^7.7.4"
     "@babel/types" "^7.7.4"
 
-"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.4.3", "@babel/traverse@^7.7.0", "@babel/traverse@^7.7.2":
-  version "7.7.2"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.7.2.tgz#ef0a65e07a2f3c550967366b3d9b62a2dcbeae09"
-  integrity sha512-TM01cXib2+rgIZrGJOLaHV/iZUAxf4A0dt5auY6KNZ+cm6aschuJGqKJM3ROTt3raPUdIDk9siAufIFEleRwtw==
-  dependencies:
-    "@babel/code-frame" "^7.5.5"
-    "@babel/generator" "^7.7.2"
-    "@babel/helper-function-name" "^7.7.0"
-    "@babel/helper-split-export-declaration" "^7.7.0"
-    "@babel/parser" "^7.7.2"
-    "@babel/types" "^7.7.2"
-    debug "^4.1.0"
-    globals "^11.1.0"
-    lodash "^4.17.13"
-
-"@babel/traverse@^7.7.4":
+"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.4.3", "@babel/traverse@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.7.4.tgz#9c1e7c60fb679fe4fcfaa42500833333c2058558"
   integrity sha512-P1L58hQyupn8+ezVA2z5KBm4/Zr4lCC8dwKCMYzsa5jFMDMQAzaBNy9W5VjB+KAmBjb40U7a/H6ao+Xo+9saIw==
@@ -804,7 +742,7 @@
     globals "^11.1.0"
     lodash "^4.17.13"
 
-"@babel/types@^7.0.0", "@babel/types@^7.3.0", "@babel/types@^7.4.0", "@babel/types@^7.7.0", "@babel/types@^7.7.2", "@babel/types@^7.7.4":
+"@babel/types@^7.0.0", "@babel/types@^7.3.0", "@babel/types@^7.4.0", "@babel/types@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.7.4.tgz#516570d539e44ddf308c07569c258ff94fde9193"
   integrity sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA==

From 3c4a3a8a32ba03e0924e2e33563aca883b7a2f08 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 27 Nov 2019 17:17:58 +0000
Subject: [PATCH 094/174] build(deps): bump apollo-server from 2.9.11 to 2.9.12
 in /backend

Bumps [apollo-server](https://github.com/apollographql/apollo-server) from 2.9.11 to 2.9.12.
- [Release notes](https://github.com/apollographql/apollo-server/releases)
- [Changelog](https://github.com/apollographql/apollo-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-server/compare/apollo-server@2.9.11...apollo-server@2.9.12)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 backend/package.json |  2 +-
 backend/yarn.lock    | 61 ++++++++++----------------------------------
 2 files changed, 14 insertions(+), 49 deletions(-)

diff --git a/backend/package.json b/backend/package.json
index 828756cc8..f80300298 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -40,7 +40,7 @@
     "apollo-client": "~2.6.4",
     "apollo-link-context": "~1.0.19",
     "apollo-link-http": "~1.5.16",
-    "apollo-server": "~2.9.11",
+    "apollo-server": "~2.9.12",
     "apollo-server-express": "^2.9.7",
     "babel-plugin-transform-runtime": "^6.23.0",
     "bcryptjs": "~2.4.3",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index fa404d317..4ec270dee 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -1693,13 +1693,6 @@ apollo-datasource@^0.6.3:
     apollo-server-caching "^0.5.0"
     apollo-server-env "^2.4.3"
 
-apollo-engine-reporting-protobuf@^0.4.3:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/apollo-engine-reporting-protobuf/-/apollo-engine-reporting-protobuf-0.4.3.tgz#c8cf52aa799a2d8fc92bd59c5942bb2989d225aa"
-  integrity sha512-ikRiu2PJOOYoTfJ1gAPB58tmVwu8IF71J9u1jWJJ7tLO+RvGOvntA4kwImiKbHrc/zsAx12lPnpjjfn7tOF1AQ==
-  dependencies:
-    protobufjs "^6.8.6"
-
 apollo-engine-reporting-protobuf@^0.4.4:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/apollo-engine-reporting-protobuf/-/apollo-engine-reporting-protobuf-0.4.4.tgz#73a064f8c9f2d6605192d1673729c66ec47d9cb7"
@@ -1788,7 +1781,7 @@ apollo-server-caching@^0.5.0:
   dependencies:
     lru-cache "^5.0.0"
 
-apollo-server-core@^2.9.11, apollo-server-core@^2.9.12:
+apollo-server-core@^2.9.12:
   version "2.9.12"
   resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-2.9.12.tgz#c8ed48540762913242eef5fce0da8b59b131a1e8"
   integrity sha512-jhGr2R655PSwUUBweXDl+0F3oa74Elu5xXF+88ymUUej34EwBUCqz97wPqR07BEuyxaAlRfZwPMvKaHhMUKg5g==
@@ -1828,10 +1821,10 @@ apollo-server-errors@^2.3.4:
   resolved "https://registry.yarnpkg.com/apollo-server-errors/-/apollo-server-errors-2.3.4.tgz#b70ef01322f616cbcd876f3e0168a1a86b82db34"
   integrity sha512-Y0PKQvkrb2Kd18d1NPlHdSqmlr8TgqJ7JQcNIfhNDgdb45CnqZlxL1abuIRhr8tiw8OhVOcFxz2KyglBi8TKdA==
 
-apollo-server-express@^2.9.11, apollo-server-express@^2.9.7:
-  version "2.9.11"
-  resolved "https://registry.yarnpkg.com/apollo-server-express/-/apollo-server-express-2.9.11.tgz#ae1b6161a563bc6aa0dd7456deec998236a4234a"
-  integrity sha512-38ZaPnahJPnibVii6i983Uu32iGR2xO5kUZvGxqH4lSPiy8V9Ph93TxeTmIlzHUqd8z4CguZsCV+ngd5KT7lFQ==
+apollo-server-express@^2.9.12, apollo-server-express@^2.9.7:
+  version "2.9.12"
+  resolved "https://registry.yarnpkg.com/apollo-server-express/-/apollo-server-express-2.9.12.tgz#e779ea2c107fcc63b0c9b888a4cbf0f65af6d505"
+  integrity sha512-4Ev8MY7m23mSzwO/BvLTy97a/68IP/wZoCRBn2R81OoZt9/GxlvvYZGvozJCXYsQt1qAbIT4Sn05LmqawsI98w==
   dependencies:
     "@apollographql/graphql-playground-html" "1.6.24"
     "@types/accepts" "^1.3.5"
@@ -1839,8 +1832,8 @@ apollo-server-express@^2.9.11, apollo-server-express@^2.9.7:
     "@types/cors" "^2.8.4"
     "@types/express" "4.17.1"
     accepts "^1.3.5"
-    apollo-server-core "^2.9.11"
-    apollo-server-types "^0.2.7"
+    apollo-server-core "^2.9.12"
+    apollo-server-types "^0.2.8"
     body-parser "^1.18.3"
     cors "^2.8.4"
     express "^4.17.1"
@@ -1864,15 +1857,6 @@ apollo-server-testing@~2.9.12:
   dependencies:
     apollo-server-core "^2.9.12"
 
-apollo-server-types@^0.2.7:
-  version "0.2.7"
-  resolved "https://registry.yarnpkg.com/apollo-server-types/-/apollo-server-types-0.2.7.tgz#832760017a9d55beda23bc7ba8af357802ee9b49"
-  integrity sha512-umbXyo7DVG6/lZIAL1D666e16+gZM/Y/kfPx2nn9KTSamIJHUDLs2p0es78RuUx2VS8XoKZDgL0BTkIi5Nt8Iw==
-  dependencies:
-    apollo-engine-reporting-protobuf "^0.4.3"
-    apollo-server-caching "^0.5.0"
-    apollo-server-env "^2.4.3"
-
 apollo-server-types@^0.2.8:
   version "0.2.8"
   resolved "https://registry.yarnpkg.com/apollo-server-types/-/apollo-server-types-0.2.8.tgz#729208a8dd72831af3aa4f1eb584022ada146e6b"
@@ -1882,13 +1866,13 @@ apollo-server-types@^0.2.8:
     apollo-server-caching "^0.5.0"
     apollo-server-env "^2.4.3"
 
-apollo-server@~2.9.11:
-  version "2.9.11"
-  resolved "https://registry.yarnpkg.com/apollo-server/-/apollo-server-2.9.11.tgz#fafa7bc8f758689b0675c3300599a9b1128c58cd"
-  integrity sha512-BhMpBqgdEYN2SqjigRyEDUDKN3GwrYXzMZXUv/WD55HaKST8RAP4GiJp8lHswdeoUfr/9fsfvtVlrN++zJziuQ==
+apollo-server@~2.9.12:
+  version "2.9.12"
+  resolved "https://registry.yarnpkg.com/apollo-server/-/apollo-server-2.9.12.tgz#3fe28c361ee373d52ae38ca190869508b0c532c0"
+  integrity sha512-Q+qaBTgTxb2vwqyh7NTHs9rOmadbuKw34SgeAOLsCnr3MLVjisa50fL3nQrGbhOGfRaroF8SSZYgya0tvnefig==
   dependencies:
-    apollo-server-core "^2.9.11"
-    apollo-server-express "^2.9.11"
+    apollo-server-core "^2.9.12"
+    apollo-server-express "^2.9.12"
     express "^4.0.0"
     graphql-subscriptions "^1.0.0"
     graphql-tools "^4.0.0"
@@ -6936,25 +6920,6 @@ property-expr@^1.5.0:
   resolved "https://registry.yarnpkg.com/property-expr/-/property-expr-1.5.1.tgz#22e8706894a0c8e28d58735804f6ba3a3673314f"
   integrity sha512-CGuc0VUTGthpJXL36ydB6jnbyOf/rAHFvmVrJlH+Rg0DqqLFQGAP6hIaxD/G0OAmBJPhXDHuEJigrp0e0wFV6g==
 
-protobufjs@^6.8.6:
-  version "6.8.8"
-  resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.8.8.tgz#c8b4f1282fd7a90e6f5b109ed11c84af82908e7c"
-  integrity sha512-AAmHtD5pXgZfi7GMpllpO3q1Xw1OYldr+dMUlAnffGTAhqkg72WdmSY71uKBF/JuyiKs8psYbtKrhi0ASCD8qw==
-  dependencies:
-    "@protobufjs/aspromise" "^1.1.2"
-    "@protobufjs/base64" "^1.1.2"
-    "@protobufjs/codegen" "^2.0.4"
-    "@protobufjs/eventemitter" "^1.1.0"
-    "@protobufjs/fetch" "^1.1.0"
-    "@protobufjs/float" "^1.0.2"
-    "@protobufjs/inquire" "^1.1.0"
-    "@protobufjs/path" "^1.1.2"
-    "@protobufjs/pool" "^1.1.0"
-    "@protobufjs/utf8" "^1.1.0"
-    "@types/long" "^4.0.0"
-    "@types/node" "^10.1.0"
-    long "^4.0.0"
-
 proxy-addr@~2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.5.tgz#34cbd64a2d81f4b1fd21e76f9f06c8a45299ee34"

From 6a52673524df726b02d1ef7792b899412391c865 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 28 Nov 2019 04:17:57 +0000
Subject: [PATCH 095/174] build(deps-dev): bump cypress from 3.6.1 to 3.7.0

Bumps [cypress](https://github.com/cypress-io/cypress) from 3.6.1 to 3.7.0.
- [Release notes](https://github.com/cypress-io/cypress/releases)
- [Commits](https://github.com/cypress-io/cypress/compare/v3.6.1...v3.7.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index d403bfe5b..0f191c647 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
     "bcryptjs": "^2.4.3",
     "codecov": "^3.6.1",
     "cross-env": "^6.0.3",
-    "cypress": "^3.6.1",
+    "cypress": "^3.7.0",
     "cypress-cucumber-preprocessor": "^1.16.2",
     "cypress-file-upload": "^3.5.0",
     "cypress-plugin-retries": "^1.4.0",
diff --git a/yarn.lock b/yarn.lock
index 4493c8492..a562071a2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1934,10 +1934,10 @@ cypress-plugin-retries@^1.4.0:
   resolved "https://registry.yarnpkg.com/cypress-plugin-retries/-/cypress-plugin-retries-1.4.0.tgz#30477294a22e368c874d50dc282e657906080955"
   integrity sha512-Pudna9+dn0wp3flUVWt1ttn6hKTnD1MIBUSznYkw+uRv3JPNJhxHIv9cfxrZmig49/R1fIyGBVNORchtnFedEw==
 
-cypress@^3.6.1:
-  version "3.6.1"
-  resolved "https://registry.yarnpkg.com/cypress/-/cypress-3.6.1.tgz#4420957923879f60b7a5146ccbf81841a149b653"
-  integrity sha512-6n0oqENdz/oQ7EJ6IgESNb2M7Bo/70qX9jSJsAziJTC3kICfEMmJUlrAnP9bn+ut24MlXQST5nRXhUP5nRIx6A==
+cypress@^3.7.0:
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/cypress/-/cypress-3.7.0.tgz#e2cd71b87b6ce0d4c72c6ea25da1005d75c1f231"
+  integrity sha512-o+vfRxqAba8TduelzfZQ4WHmj2yNEjaoO2EuZ8dZ9pJpuW+WGtBGheKIp6zkoQsp8ZgFe8OoHh1i2mY8BDnMAw==
   dependencies:
     "@cypress/listr-verbose-renderer" "0.4.1"
     "@cypress/xvfb" "1.2.4"

From 98623133febda37deb196f9ef233baefc0011c66 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 28 Nov 2019 04:18:22 +0000
Subject: [PATCH 096/174] build(deps): bump graphql-shield from 7.0.2 to 7.0.4
 in /backend

Bumps [graphql-shield](https://github.com/maticzav/graphql-shield) from 7.0.2 to 7.0.4.
- [Release notes](https://github.com/maticzav/graphql-shield/releases)
- [Commits](https://github.com/maticzav/graphql-shield/compare/v7.0.2...v7.0.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 backend/package.json |  2 +-
 backend/yarn.lock    | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/backend/package.json b/backend/package.json
index 828756cc8..232991a53 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -57,7 +57,7 @@
     "graphql-iso-date": "~3.6.1",
     "graphql-middleware": "~4.0.2",
     "graphql-middleware-sentry": "^3.2.1",
-    "graphql-shield": "~7.0.2",
+    "graphql-shield": "~7.0.4",
     "graphql-tag": "~2.10.1",
     "helmet": "~3.21.2",
     "jsonwebtoken": "~8.5.1",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index fa404d317..ad7588c11 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -1453,10 +1453,10 @@
   dependencies:
     "@types/yargs-parser" "*"
 
-"@types/yup@0.26.24":
-  version "0.26.24"
-  resolved "https://registry.yarnpkg.com/@types/yup/-/yup-0.26.24.tgz#c24170b3a5c867b4fabd49fcc42fe45f780cb153"
-  integrity sha512-x0bhHnYjH5mZit4HivUYbTMO4LouOTGwp/LLxSL1mbJYVwNJtHYESH0ed2bwM1lkI2yDmsoCDYJnWEgHeJDACg==
+"@types/yup@0.26.26":
+  version "0.26.26"
+  resolved "https://registry.yarnpkg.com/@types/yup/-/yup-0.26.26.tgz#2e7065384ac2b7711271d8790f26ac7d73f6a33d"
+  integrity sha512-5cLJLd8NIT7OfJLi7ScquRn/NWfmewBqJ92nT/FYfdpgKzyUNcR4n2BKEOQ7mOG8WuJXgomIvNl5P3sn9Akd4A==
 
 "@types/zen-observable@^0.8.0":
   version "0.8.0"
@@ -4173,12 +4173,12 @@ graphql-middleware@~4.0.2:
   dependencies:
     graphql-tools "^4.0.5"
 
-graphql-shield@~7.0.2:
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/graphql-shield/-/graphql-shield-7.0.2.tgz#65d51528b4e36c4a5023276267abbd1abb57ce0b"
-  integrity sha512-ZgCQ9efzgehkIVMFoxaOubnvwHVqthtsIXA+xRu8B4ga2Ch/EHiswNCDKpTXTBQZmjeDCSHeAj4XDmbzR4Trxw==
+graphql-shield@~7.0.4:
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/graphql-shield/-/graphql-shield-7.0.4.tgz#fdff8066f9fbb86b363e7dd6a9cf295dbbf8a09b"
+  integrity sha512-+SEz/tKx2uJAbMKzS7X0hCUWsZo54J8SARhXb5jNDG/RKur44mjIGfBnuBRszw73+dUdBvTlLl1j1WKwm0ZhEA==
   dependencies:
-    "@types/yup" "0.26.24"
+    "@types/yup" "0.26.26"
     object-hash "^2.0.0"
     yup "^0.27.0"
 

From 0a5a0668c818fe0fd416d825580a2dfd4398f2a6 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 28 Nov 2019 04:19:49 +0000
Subject: [PATCH 097/174] build(deps): bump @nuxtjs/apollo in /webapp

Bumps [@nuxtjs/apollo](https://github.com/nuxt-community/apollo-module) from 4.0.0-rc17 to 4.0.0-rc18.
- [Release notes](https://github.com/nuxt-community/apollo-module/releases)
- [Commits](https://github.com/nuxt-community/apollo-module/compare/v4.0.0-rc.17...v4.0.0-rc.18)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 webapp/package.json |  2 +-
 webapp/yarn.lock    | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/webapp/package.json b/webapp/package.json
index 4c26fce0b..a8fbfbcf5 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -58,7 +58,7 @@
   },
   "dependencies": {
     "@human-connection/styleguide": "0.5.21",
-    "@nuxtjs/apollo": "^4.0.0-rc17",
+    "@nuxtjs/apollo": "^4.0.0-rc18",
     "@nuxtjs/axios": "~5.8.0",
     "@nuxtjs/dotenv": "~1.4.1",
     "@nuxtjs/pwa": "^3.0.0-beta.19",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index 094f5485c..a45b3e378 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -1549,14 +1549,14 @@
     webpack-node-externals "^1.7.2"
     webpackbar "^4.0.0"
 
-"@nuxtjs/apollo@^4.0.0-rc17":
-  version "4.0.0-rc17"
-  resolved "https://registry.yarnpkg.com/@nuxtjs/apollo/-/apollo-4.0.0-rc17.tgz#089ae5bdd70021d2a05076d1a5dfebdc5700cbe2"
-  integrity sha512-HCtbfvfO2H1HQEKNmPczZfroKPt4SYPyuY6XEMbYW6S16SGr95644Ne7/wo7BW4OSXybpr/HYXKYceEGga9Z2g==
+"@nuxtjs/apollo@^4.0.0-rc18":
+  version "4.0.0-rc18"
+  resolved "https://registry.yarnpkg.com/@nuxtjs/apollo/-/apollo-4.0.0-rc18.tgz#0069cae64f414ed879d20de00881986dca6bb26c"
+  integrity sha512-DTwRw9XLJKyphZiVwtKn4hE6Vfn6BlxEDWFBMTXpKE3XUKpg5+Qcgr8GstkiKtWbOuNQi660KdZReJ48R8bxgQ==
   dependencies:
     cross-fetch "^3.0.4"
     universal-cookie "^4.0.2"
-    vue-apollo "^3.0.0"
+    vue-apollo "^3.0.1"
     vue-cli-plugin-apollo "^0.21.3"
     webpack-node-externals "^1.7.2"
 
@@ -16257,10 +16257,10 @@ vscode-uri@^1.0.6:
   resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-1.0.8.tgz#9769aaececae4026fb6e22359cb38946580ded59"
   integrity sha512-obtSWTlbJ+a+TFRYGaUumtVwb+InIUVI0Lu0VBUAPmj2cU5JutEXg3xUE0c2J5Tcy7h2DEKVJBFi+Y9ZSFzzPQ==
 
-vue-apollo@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/vue-apollo/-/vue-apollo-3.0.0.tgz#e252130b18cbd7b0d060fc3dd9616813e4a65acf"
-  integrity sha512-ByeKajmgItICrOkUl2j/XzqWjv2FOdQYAPsuGyry4yrQBCU641gSoZZn1TjHiR9rAsR2aycGsY9vuV0sN14Mbg==
+vue-apollo@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/vue-apollo/-/vue-apollo-3.0.1.tgz#b7c24b6d6032bf707be7872e6615d59aa6621241"
+  integrity sha512-NM+kWbPGV5bnRMK7BmMJMxoT1NqPjVAYf+MsjPDyfQNgyVEHSIObRVqLQDIs56PYQSC6YOGa0luo6Ykjj6rrPw==
   dependencies:
     chalk "^2.4.2"
     serialize-javascript "^2.1.0"

From 9e2baf25d2a607338b3e0c7889f799d1cd472709 Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Thu, 28 Nov 2019 11:18:14 +0100
Subject: [PATCH 098/174] Don't remove dots in emails

---
 backend/src/schema/resolvers/emails.js                 |  2 +-
 .../schema/resolvers/helpers/createPasswordReset.js    |  2 +-
 backend/src/schema/resolvers/helpers/normalizeEmail.js | 10 ++++++++++
 backend/src/schema/resolvers/registration.js           |  2 +-
 backend/src/schema/resolvers/user_management.js        |  2 +-
 webapp/components/PasswordReset/Request.vue            |  2 +-
 webapp/components/utils/NormalizeEmail.js              | 10 ++++++++++
 webapp/pages/admin/users.vue                           |  3 ++-
 webapp/pages/settings/my-email-address/index.vue       |  2 +-
 9 files changed, 28 insertions(+), 7 deletions(-)
 create mode 100644 backend/src/schema/resolvers/helpers/normalizeEmail.js
 create mode 100644 webapp/components/utils/NormalizeEmail.js

diff --git a/backend/src/schema/resolvers/emails.js b/backend/src/schema/resolvers/emails.js
index 06c0dbd1a..8711a5996 100644
--- a/backend/src/schema/resolvers/emails.js
+++ b/backend/src/schema/resolvers/emails.js
@@ -3,7 +3,7 @@ import Resolver from './helpers/Resolver'
 import existingEmailAddress from './helpers/existingEmailAddress'
 import { UserInputError } from 'apollo-server'
 import Validator from 'neode/build/Services/Validator.js'
-import { normalizeEmail } from 'validator'
+import normalizeEmail from './helpers/normalizeEmail'
 
 export default {
   Mutation: {
diff --git a/backend/src/schema/resolvers/helpers/createPasswordReset.js b/backend/src/schema/resolvers/helpers/createPasswordReset.js
index 8d575abfc..d73cfaa81 100644
--- a/backend/src/schema/resolvers/helpers/createPasswordReset.js
+++ b/backend/src/schema/resolvers/helpers/createPasswordReset.js
@@ -1,4 +1,4 @@
-import { normalizeEmail } from 'validator'
+import normalizeEmail from './normalizeEmail'
 
 export default async function createPasswordReset(options) {
   const { driver, nonce, email, issuedAt = new Date() } = options
diff --git a/backend/src/schema/resolvers/helpers/normalizeEmail.js b/backend/src/schema/resolvers/helpers/normalizeEmail.js
new file mode 100644
index 000000000..da190085c
--- /dev/null
+++ b/backend/src/schema/resolvers/helpers/normalizeEmail.js
@@ -0,0 +1,10 @@
+import { normalizeEmail } from 'validator'
+
+export default (email) => normalizeEmail(email, {
+  gmail_remove_dots: false,
+  gmail_remove_subaddress: false,
+  // gmail_convert_googlemaildotcom: true, default
+  outlookdotcom_remove_subaddress: false,
+  yahoo_remove_subaddress: false,
+  icloud_remove_subaddress: false,
+})
diff --git a/backend/src/schema/resolvers/registration.js b/backend/src/schema/resolvers/registration.js
index d425357c3..639c607b7 100644
--- a/backend/src/schema/resolvers/registration.js
+++ b/backend/src/schema/resolvers/registration.js
@@ -4,7 +4,7 @@ import fileUpload from './fileUpload'
 import encryptPassword from '../../helpers/encryptPassword'
 import generateNonce from './helpers/generateNonce'
 import existingEmailAddress from './helpers/existingEmailAddress'
-import { normalizeEmail } from 'validator'
+import normalizeEmail from './helpers/normalizeEmail'
 
 const instance = neode()
 
diff --git a/backend/src/schema/resolvers/user_management.js b/backend/src/schema/resolvers/user_management.js
index b7584dd68..81550d8cf 100644
--- a/backend/src/schema/resolvers/user_management.js
+++ b/backend/src/schema/resolvers/user_management.js
@@ -2,7 +2,7 @@ import encode from '../../jwt/encode'
 import bcrypt from 'bcryptjs'
 import { AuthenticationError } from 'apollo-server'
 import { neode } from '../../bootstrap/neo4j'
-import { normalizeEmail } from 'validator'
+import normalizeEmail from './helpers/normalizeEmail'
 
 const instance = neode()
 
diff --git a/webapp/components/PasswordReset/Request.vue b/webapp/components/PasswordReset/Request.vue
index 1cf575574..30b86e8c2 100644
--- a/webapp/components/PasswordReset/Request.vue
+++ b/webapp/components/PasswordReset/Request.vue
@@ -46,7 +46,7 @@
 <script>
 import gql from 'graphql-tag'
 import { SweetalertIcon } from 'vue-sweetalert-icons'
-import { normalizeEmail } from 'validator'
+import normalizeEmail from '~/components/utils/NormalizeEmail'
 
 export default {
   components: {
diff --git a/webapp/components/utils/NormalizeEmail.js b/webapp/components/utils/NormalizeEmail.js
new file mode 100644
index 000000000..da190085c
--- /dev/null
+++ b/webapp/components/utils/NormalizeEmail.js
@@ -0,0 +1,10 @@
+import { normalizeEmail } from 'validator'
+
+export default (email) => normalizeEmail(email, {
+  gmail_remove_dots: false,
+  gmail_remove_subaddress: false,
+  // gmail_convert_googlemaildotcom: true, default
+  outlookdotcom_remove_subaddress: false,
+  yahoo_remove_subaddress: false,
+  icloud_remove_subaddress: false,
+})
diff --git a/webapp/pages/admin/users.vue b/webapp/pages/admin/users.vue
index 67594180d..6a7bf8adb 100644
--- a/webapp/pages/admin/users.vue
+++ b/webapp/pages/admin/users.vue
@@ -67,7 +67,8 @@
 
 <script>
 import gql from 'graphql-tag'
-import { isEmail, normalizeEmail } from 'validator'
+import { isEmail } from 'validator'
+import normalizeEmail from '~/components/utils/NormalizeEmail'
 
 export default {
   data() {
diff --git a/webapp/pages/settings/my-email-address/index.vue b/webapp/pages/settings/my-email-address/index.vue
index 5a84f3795..8b3889b0d 100644
--- a/webapp/pages/settings/my-email-address/index.vue
+++ b/webapp/pages/settings/my-email-address/index.vue
@@ -32,7 +32,7 @@
 import { mapGetters } from 'vuex'
 import { AddEmailAddressMutation } from '~/graphql/EmailAddress.js'
 import { SweetalertIcon } from 'vue-sweetalert-icons'
-import { normalizeEmail } from 'validator'
+import normalizeEmail from '~/components/utils/NormalizeEmail'
 
 export default {
   components: {

From a1a68a36ce0d3647e1a6f2a330e2f4a34b61c695 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 28 Nov 2019 10:40:27 +0000
Subject: [PATCH 099/174] build(deps-dev): bump @babel/cli from 7.7.0 to 7.7.4
 in /backend

Bumps [@babel/cli](https://github.com/babel/babel) from 7.7.0 to 7.7.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.7.0...v7.7.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 backend/package.json |  2 +-
 backend/yarn.lock    | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/backend/package.json b/backend/package.json
index 3ecbba57b..62fb5b1e5 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -99,7 +99,7 @@
     "xregexp": "^4.2.4"
   },
   "devDependencies": {
-    "@babel/cli": "~7.7.0",
+    "@babel/cli": "~7.7.4",
     "@babel/core": "~7.7.4",
     "@babel/node": "~7.7.4",
     "@babel/plugin-proposal-throw-expressions": "^7.7.4",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 647d6a20a..f9aa403a4 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -33,12 +33,12 @@
   resolved "https://registry.yarnpkg.com/@apollographql/graphql-playground-html/-/graphql-playground-html-1.6.24.tgz#3ce939cb127fb8aaa3ffc1e90dff9b8af9f2e3dc"
   integrity sha512-8GqG48m1XqyXh4mIZrtB5xOhUwSsh1WsrrsaZQOEYYql3YN9DEu9OOSg0ILzXHZo/h2Q74777YE4YzlArQzQEQ==
 
-"@babel/cli@~7.7.0":
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.7.0.tgz#8d10c9acb2acb362d7614a9493e1791c69100d89"
-  integrity sha512-jECEqAq6Ngf3pOhLSg7od9WKyrIacyh1oNNYtRXNn+ummSHCTXBamGywOAtiae34Vk7zKuQNnLvo2BKTMCoV4A==
+"@babel/cli@~7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.7.4.tgz#38804334c8db40209f88c69a5c90998e60cca18b"
+  integrity sha512-O7mmzaWdm+VabWQmxuM8hqNrWGGihN83KfhPUzp2lAW4kzIMwBxujXkZbD4fMwKMYY9FXTbDvXsJqU+5XHXi4A==
   dependencies:
-    commander "^2.8.1"
+    commander "^4.0.1"
     convert-source-map "^1.1.0"
     fs-readdir-recursive "^1.1.0"
     glob "^7.0.0"
@@ -2570,6 +2570,11 @@ commander@^3.0.1:
   resolved "https://registry.yarnpkg.com/commander/-/commander-3.0.2.tgz#6837c3fb677ad9933d1cfba42dd14d5117d6b39e"
   integrity sha512-Gar0ASD4BDyKC4hl4DwHqDrmvjoxWKZigVnAbn5H1owvm4CxCPdb0HQDehwNYMJpla5+M2tPmPARzhtYuwpHow==
 
+commander@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-4.0.1.tgz#b67622721785993182e807f4883633e6401ba53c"
+  integrity sha512-IPF4ouhCP+qdlcmCedhxX4xiGBPyigb8v5NeUp+0LyhwLgxMqyp3S0vl7TAPfS/hiP7FC3caI/PB9lTmP8r1NA==
+
 commondir@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"

From 679792f93e9f1297f71a76b6028257f21a404f1c Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 28 Nov 2019 10:48:22 +0000
Subject: [PATCH 100/174] build(deps-dev): bump cypress-plugin-retries from
 1.4.0 to 1.5.0

Bumps [cypress-plugin-retries](https://github.com/Bkucera/cypress-plugin-retries) from 1.4.0 to 1.5.0.
- [Release notes](https://github.com/Bkucera/cypress-plugin-retries/releases)
- [Commits](https://github.com/Bkucera/cypress-plugin-retries/compare/v1.4.0...v1.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 package.json |  2 +-
 yarn.lock    | 55 ++++++++++++++++++++++++++++++++++++++++++++++++----
 2 files changed, 52 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 0f191c647..aff935fca 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
     "cypress": "^3.7.0",
     "cypress-cucumber-preprocessor": "^1.16.2",
     "cypress-file-upload": "^3.5.0",
-    "cypress-plugin-retries": "^1.4.0",
+    "cypress-plugin-retries": "^1.5.0",
     "date-fns": "^2.8.1",
     "dotenv": "^8.2.0",
     "faker": "Marak/faker.js#master",
diff --git a/yarn.lock b/yarn.lock
index a562071a2..a4cd308ad 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -891,6 +891,11 @@
   dependencies:
     "@hapi/hoek" "8.x.x"
 
+"@types/color-name@^1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"
+  integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==
+
 "@types/sizzle@2.3.2":
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/@types/sizzle/-/sizzle-2.3.2.tgz#a811b8c18e2babab7d542b3365887ae2e4d9de47"
@@ -978,6 +983,14 @@ ansi-styles@^3.2.1:
   dependencies:
     color-convert "^1.9.0"
 
+ansi-styles@^4.1.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.0.tgz#5681f0dcf7ae5880a7841d8831c4724ed9cc0172"
+  integrity sha512-7kFQgnEaMdRtwf6uSfUnVr9gSGC7faurn+J/Mv90/W+iTtN0405/nLdopfMWwchyxhbGYl6TC4Sccn9TUkGAgg==
+  dependencies:
+    "@types/color-name" "^1.1.1"
+    color-convert "^2.0.1"
+
 any-promise@^1.0.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f"
@@ -1503,6 +1516,14 @@ chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
+chalk@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4"
+  integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
 check-error@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82"
@@ -1631,11 +1652,23 @@ color-convert@^1.9.0:
   dependencies:
     color-name "1.1.3"
 
+color-convert@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
+  integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
+  dependencies:
+    color-name "~1.1.4"
+
 color-name@1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
   integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
 
+color-name@~1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
+  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
+
 colors@1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b"
@@ -1929,10 +1962,12 @@ cypress-file-upload@^3.5.0:
   resolved "https://registry.yarnpkg.com/cypress-file-upload/-/cypress-file-upload-3.5.0.tgz#7ff6294a3be68adcac72bc1fa25c75c57e0701fc"
   integrity sha512-MgrsP4C2pUMvHqixH33OtXHNKkwQZV6ny0fu+APDTEP9O/uuKFh3sYcnPNU6XGfuC85/RmqVNw21ZQyyT+S5IQ==
 
-cypress-plugin-retries@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/cypress-plugin-retries/-/cypress-plugin-retries-1.4.0.tgz#30477294a22e368c874d50dc282e657906080955"
-  integrity sha512-Pudna9+dn0wp3flUVWt1ttn6hKTnD1MIBUSznYkw+uRv3JPNJhxHIv9cfxrZmig49/R1fIyGBVNORchtnFedEw==
+cypress-plugin-retries@^1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/cypress-plugin-retries/-/cypress-plugin-retries-1.5.0.tgz#717cdfd7f2a8f07f218eb23e93ff6f7aa4c95029"
+  integrity sha512-nSJx4RkbeQFGjsymPWabn7i2GmxULUu9SqtiJqoVFa1XfVtQC1Uoogxj/zZzhrWYwYJ2183xslb9HqQV6bafFQ==
+  dependencies:
+    chalk "^3.0.0"
 
 cypress@^3.7.0:
   version "3.7.0"
@@ -2643,6 +2678,11 @@ has-flag@^3.0.0:
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
   integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
 
+has-flag@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
+  integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
+
 has-symbols@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz#ba1a8f1af2a0fc39650f5c850367704122063b44"
@@ -4677,6 +4717,13 @@ supports-color@^2.0.0:
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
   integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
 
+supports-color@^7.1.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1"
+  integrity sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==
+  dependencies:
+    has-flag "^4.0.0"
+
 symbol-observable@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.1.tgz#8340fc4702c3122df5d22288f88283f513d3fdd4"

From 21be2c08ba841e2d836b19148a2e74e011e9bea6 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Thu, 28 Nov 2019 13:44:00 +0100
Subject: [PATCH 101/174] Update to return resource instead of to

- more verbose makes it easier to understand
---
 backend/src/schema/resolvers/moderation.js    |  2 +-
 .../src/schema/resolvers/moderation.spec.js   | 52 +++++++++++--------
 backend/src/schema/resolvers/reports.js       |  2 +-
 backend/src/schema/resolvers/reports.spec.js  | 22 ++++----
 backend/src/schema/types/type/FILED.gql       |  3 --
 backend/src/schema/types/type/REVIEWED.gql    |  2 +-
 backend/src/schema/types/type/Report.gql      |  2 +-
 webapp/graphql/Moderation.js                  |  2 +-
 8 files changed, 45 insertions(+), 42 deletions(-)

diff --git a/backend/src/schema/resolvers/moderation.js b/backend/src/schema/resolvers/moderation.js
index 730ff73c3..b60325cc4 100644
--- a/backend/src/schema/resolvers/moderation.js
+++ b/backend/src/schema/resolvers/moderation.js
@@ -2,7 +2,7 @@ const transformReturnType = record => {
   return {
     ...record.get('review').properties,
     report: record.get('report').properties,
-    to: {
+    resource: {
       __typename: record.get('type'),
       ...record.get('resource').properties,
     },
diff --git a/backend/src/schema/resolvers/moderation.spec.js b/backend/src/schema/resolvers/moderation.spec.js
index 6dd2b41f7..5b4a5d75a 100644
--- a/backend/src/schema/resolvers/moderation.spec.js
+++ b/backend/src/schema/resolvers/moderation.spec.js
@@ -21,7 +21,7 @@ const reviewMutation = gql`
     review(resourceId: $resourceId, disable: $disable, closed: $closed) {
       createdAt
       updatedAt
-      to {
+      resource {
         __typename
         ... on User {
           id
@@ -149,7 +149,7 @@ describe('moderate resources', () => {
         ).resolves.toMatchObject({
           data: {
             review: {
-              to: { __typename: 'Post', id: 'should-i-be-disabled', disabled: false },
+              resource: { __typename: 'Post', id: 'should-i-be-disabled', disabled: false },
               report: { id: expect.any(String), closed: true },
             },
           },
@@ -231,7 +231,7 @@ describe('moderate resources', () => {
           await expect(
             mutate({ mutation: reviewMutation, variables: disableVariables }),
           ).resolves.toMatchObject({
-            data: { review: { to: { __typename: 'Comment', id: 'comment-id' } } },
+            data: { review: { resource: { __typename: 'Comment', id: 'comment-id' } } },
             errors: undefined,
           })
         })
@@ -242,7 +242,7 @@ describe('moderate resources', () => {
           ).resolves.toMatchObject({
             data: {
               review: {
-                to: { __typename: 'Comment', id: 'comment-id' },
+                resource: { __typename: 'Comment', id: 'comment-id' },
                 report: { id: expect.any(String), reviewedByModerator: { id: 'moderator-id' } },
               },
             },
@@ -253,7 +253,9 @@ describe('moderate resources', () => {
           await expect(
             mutate({ mutation: reviewMutation, variables: disableVariables }),
           ).resolves.toMatchObject({
-            data: { review: { to: { __typename: 'Comment', id: 'comment-id', disabled: true } } },
+            data: {
+              review: { resource: { __typename: 'Comment', id: 'comment-id', disabled: true } },
+            },
           })
         })
 
@@ -267,7 +269,7 @@ describe('moderate resources', () => {
           ).resolves.toMatchObject({
             data: {
               review: {
-                to: { __typename: 'Comment', id: 'comment-id' },
+                resource: { __typename: 'Comment', id: 'comment-id' },
                 report: { id: expect.any(String), closed: true },
               },
             },
@@ -301,7 +303,7 @@ describe('moderate resources', () => {
           ).resolves.toMatchObject({
             data: {
               review: {
-                to: { __typename: 'Post', id: 'post-id' },
+                resource: { __typename: 'Post', id: 'post-id' },
               },
             },
           })
@@ -313,7 +315,7 @@ describe('moderate resources', () => {
           ).resolves.toMatchObject({
             data: {
               review: {
-                to: { __typename: 'Post', id: 'post-id' },
+                resource: { __typename: 'Post', id: 'post-id' },
                 report: { id: expect.any(String), reviewedByModerator: { id: 'moderator-id' } },
               },
             },
@@ -324,7 +326,7 @@ describe('moderate resources', () => {
           await expect(
             mutate({ mutation: reviewMutation, variables: disableVariables }),
           ).resolves.toMatchObject({
-            data: { review: { to: { __typename: 'Post', id: 'post-id', disabled: true } } },
+            data: { review: { resource: { __typename: 'Post', id: 'post-id', disabled: true } } },
           })
         })
 
@@ -338,7 +340,7 @@ describe('moderate resources', () => {
           ).resolves.toMatchObject({
             data: {
               review: {
-                to: { __typename: 'Post', id: 'post-id' },
+                resource: { __typename: 'Post', id: 'post-id' },
                 report: { id: expect.any(String), closed: true },
               },
             },
@@ -370,7 +372,7 @@ describe('moderate resources', () => {
           await expect(
             mutate({ mutation: reviewMutation, variables: disableVariables }),
           ).resolves.toMatchObject({
-            data: { review: { to: { __typename: 'User', id: 'user-id' } } },
+            data: { review: { resource: { __typename: 'User', id: 'user-id' } } },
           })
         })
 
@@ -380,7 +382,7 @@ describe('moderate resources', () => {
           ).resolves.toMatchObject({
             data: {
               review: {
-                to: { __typename: 'User', id: 'user-id' },
+                resource: { __typename: 'User', id: 'user-id' },
                 report: { id: expect.any(String), reviewedByModerator: { id: 'moderator-id' } },
               },
             },
@@ -391,7 +393,7 @@ describe('moderate resources', () => {
           await expect(
             mutate({ mutation: reviewMutation, variables: disableVariables }),
           ).resolves.toMatchObject({
-            data: { review: { to: { __typename: 'User', id: 'user-id', disabled: true } } },
+            data: { review: { resource: { __typename: 'User', id: 'user-id', disabled: true } } },
           })
         })
 
@@ -405,7 +407,7 @@ describe('moderate resources', () => {
           ).resolves.toMatchObject({
             data: {
               review: {
-                to: { __typename: 'User', id: 'user-id' },
+                resource: { __typename: 'User', id: 'user-id' },
                 report: { id: expect.any(String), closed: true },
               },
             },
@@ -503,7 +505,7 @@ describe('moderate resources', () => {
             await expect(
               mutate({ mutation: reviewMutation, variables: enableVariables }),
             ).resolves.toMatchObject({
-              data: { review: { to: { __typename: 'Comment', id: 'comment-id' } } },
+              data: { review: { resource: { __typename: 'Comment', id: 'comment-id' } } },
             })
           })
 
@@ -513,7 +515,7 @@ describe('moderate resources', () => {
             ).resolves.toMatchObject({
               data: {
                 review: {
-                  to: { __typename: 'Comment', id: 'comment-id' },
+                  resource: { __typename: 'Comment', id: 'comment-id' },
                   report: { id: expect.any(String), reviewedByModerator: { id: 'moderator-id' } },
                 },
               },
@@ -525,7 +527,7 @@ describe('moderate resources', () => {
               mutate({ mutation: reviewMutation, variables: enableVariables }),
             ).resolves.toMatchObject({
               data: {
-                review: { to: { __typename: 'Comment', id: 'comment-id', disabled: false } },
+                review: { resource: { __typename: 'Comment', id: 'comment-id', disabled: false } },
               },
             })
           })
@@ -563,7 +565,7 @@ describe('moderate resources', () => {
             await expect(
               mutate({ mutation: reviewMutation, variables: enableVariables }),
             ).resolves.toMatchObject({
-              data: { review: { to: { __typename: 'Post', id: 'post-id' } } },
+              data: { review: { resource: { __typename: 'Post', id: 'post-id' } } },
             })
           })
 
@@ -573,7 +575,7 @@ describe('moderate resources', () => {
             ).resolves.toMatchObject({
               data: {
                 review: {
-                  to: { __typename: 'Post', id: 'post-id' },
+                  resource: { __typename: 'Post', id: 'post-id' },
                   report: { id: expect.any(String), reviewedByModerator: { id: 'moderator-id' } },
                 },
               },
@@ -584,7 +586,9 @@ describe('moderate resources', () => {
             await expect(
               mutate({ mutation: reviewMutation, variables: enableVariables }),
             ).resolves.toMatchObject({
-              data: { review: { to: { __typename: 'Post', id: 'post-id', disabled: false } } },
+              data: {
+                review: { resource: { __typename: 'Post', id: 'post-id', disabled: false } },
+              },
             })
           })
         })
@@ -620,7 +624,7 @@ describe('moderate resources', () => {
             await expect(
               mutate({ mutation: reviewMutation, variables: enableVariables }),
             ).resolves.toMatchObject({
-              data: { review: { to: { __typename: 'User', id: 'user-id' } } },
+              data: { review: { resource: { __typename: 'User', id: 'user-id' } } },
             })
           })
 
@@ -630,7 +634,7 @@ describe('moderate resources', () => {
             ).resolves.toMatchObject({
               data: {
                 review: {
-                  to: { __typename: 'User', id: 'user-id' },
+                  resource: { __typename: 'User', id: 'user-id' },
                   report: { id: expect.any(String), reviewedByModerator: { id: 'moderator-id' } },
                 },
               },
@@ -641,7 +645,9 @@ describe('moderate resources', () => {
             await expect(
               mutate({ mutation: reviewMutation, variables: enableVariables }),
             ).resolves.toMatchObject({
-              data: { review: { to: { __typename: 'User', id: 'user-id', disabled: false } } },
+              data: {
+                review: { resource: { __typename: 'User', id: 'user-id', disabled: false } },
+              },
             })
           })
         })
diff --git a/backend/src/schema/resolvers/reports.js b/backend/src/schema/resolvers/reports.js
index 9269c9751..06c0a151e 100644
--- a/backend/src/schema/resolvers/reports.js
+++ b/backend/src/schema/resolvers/reports.js
@@ -1,7 +1,7 @@
 const transformReturnType = record => {
   return {
     ...record.get('report').properties,
-    to: {
+    resource: {
       __typename: record.get('type'),
       ...record.get('resource').properties,
     },
diff --git a/backend/src/schema/resolvers/reports.spec.js b/backend/src/schema/resolvers/reports.spec.js
index e5552497d..648f63dce 100644
--- a/backend/src/schema/resolvers/reports.spec.js
+++ b/backend/src/schema/resolvers/reports.spec.js
@@ -23,7 +23,7 @@ describe('file a report on a resource', () => {
         updatedAt
         disable
         closed
-        to {
+        resource {
           __typename
           ... on User {
             name
@@ -164,7 +164,7 @@ describe('file a report on a resource', () => {
             ).resolves.toMatchObject({
               data: {
                 fileReport: {
-                  to: {
+                  resource: {
                     __typename: 'User',
                   },
                 },
@@ -182,7 +182,7 @@ describe('file a report on a resource', () => {
             ).resolves.toMatchObject({
               data: {
                 fileReport: {
-                  to: {
+                  resource: {
                     __typename: 'User',
                     name: 'abusive-user',
                   },
@@ -346,7 +346,7 @@ describe('file a report on a resource', () => {
             ).resolves.toMatchObject({
               data: {
                 fileReport: {
-                  to: {
+                  resource: {
                     __typename: 'Post',
                   },
                 },
@@ -367,7 +367,7 @@ describe('file a report on a resource', () => {
             ).resolves.toMatchObject({
               data: {
                 fileReport: {
-                  to: {
+                  resource: {
                     __typename: 'Post',
                     title: 'This is a post that is going to be reported',
                   },
@@ -408,7 +408,7 @@ describe('file a report on a resource', () => {
             ).resolves.toMatchObject({
               data: {
                 fileReport: {
-                  to: {
+                  resource: {
                     __typename: 'Comment',
                   },
                 },
@@ -429,7 +429,7 @@ describe('file a report on a resource', () => {
             ).resolves.toMatchObject({
               data: {
                 fileReport: {
-                  to: {
+                  resource: {
                     __typename: 'Comment',
                     content: 'Post comment to be reported.',
                   },
@@ -475,7 +475,7 @@ describe('file a report on a resource', () => {
           updatedAt
           disable
           closed
-          to {
+          resource {
             __typename
             ... on User {
               id
@@ -610,7 +610,7 @@ describe('file a report on a resource', () => {
               updatedAt: expect.any(String),
               disable: false,
               closed: false,
-              to: {
+              resource: {
                 __typename: 'User',
                 id: 'abusive-user-1',
               },
@@ -631,7 +631,7 @@ describe('file a report on a resource', () => {
               updatedAt: expect.any(String),
               disable: false,
               closed: false,
-              to: {
+              resource: {
                 __typename: 'Post',
                 id: 'abusive-post-1',
               },
@@ -652,7 +652,7 @@ describe('file a report on a resource', () => {
               updatedAt: expect.any(String),
               disable: false,
               closed: false,
-              to: {
+              resource: {
                 __typename: 'Comment',
                 id: 'abusive-comment-1',
               },
diff --git a/backend/src/schema/types/type/FILED.gql b/backend/src/schema/types/type/FILED.gql
index 752139e04..955af0bb8 100644
--- a/backend/src/schema/types/type/FILED.gql
+++ b/backend/src/schema/types/type/FILED.gql
@@ -17,9 +17,6 @@ enum ReasonCategory {
   criminal_behavior_violation_german_law
 }
 
-# not yet supported
-# union ReportResource = User | Post | Comment
-
 enum ReportOrdering {
   createdAt_asc
   createdAt_desc
diff --git a/backend/src/schema/types/type/REVIEWED.gql b/backend/src/schema/types/type/REVIEWED.gql
index 5b4a392ae..d106e1f4c 100644
--- a/backend/src/schema/types/type/REVIEWED.gql
+++ b/backend/src/schema/types/type/REVIEWED.gql
@@ -7,7 +7,7 @@ type REVIEWED {
     # @cypher(statement: "MATCH (report:Report)<-[this:REVIEWED]-(:User) RETURN report")
   moderator: User
   type: String
-  to: ReviewedResource
+  resource: ReviewedResource
 }
 union ReviewedResource = User | Post | Comment
 
diff --git a/backend/src/schema/types/type/Report.gql b/backend/src/schema/types/type/Report.gql
index 6dee7f282..aa94415a4 100644
--- a/backend/src/schema/types/type/Report.gql
+++ b/backend/src/schema/types/type/Report.gql
@@ -6,7 +6,7 @@ type Report {
   disable: Boolean!
   closed: Boolean!
   reportsFiled: [FILED]
-  to: ReportedResource
+  resource: ReportedResource
   type: String
   reviewedByModerator: User
 }
diff --git a/webapp/graphql/Moderation.js b/webapp/graphql/Moderation.js
index d26dfbf8b..406f8d1fc 100644
--- a/webapp/graphql/Moderation.js
+++ b/webapp/graphql/Moderation.js
@@ -10,7 +10,7 @@ export const reportListQuery = () => {
         updatedAt
         disable
         closed
-        to {
+        resource {
           __typename
           ... on User {
             id

From 7146e0a9b2bd28af1eec841aae502409493ce373 Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Thu, 28 Nov 2019 13:48:09 +0100
Subject: [PATCH 102/174] Fix lint

---
 .../schema/resolvers/helpers/normalizeEmail.js  | 17 +++++++++--------
 webapp/components/utils/NormalizeEmail.js       | 17 +++++++++--------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/backend/src/schema/resolvers/helpers/normalizeEmail.js b/backend/src/schema/resolvers/helpers/normalizeEmail.js
index da190085c..090ae9126 100644
--- a/backend/src/schema/resolvers/helpers/normalizeEmail.js
+++ b/backend/src/schema/resolvers/helpers/normalizeEmail.js
@@ -1,10 +1,11 @@
 import { normalizeEmail } from 'validator'
 
-export default (email) => normalizeEmail(email, {
-  gmail_remove_dots: false,
-  gmail_remove_subaddress: false,
-  // gmail_convert_googlemaildotcom: true, default
-  outlookdotcom_remove_subaddress: false,
-  yahoo_remove_subaddress: false,
-  icloud_remove_subaddress: false,
-})
+export default email =>
+  normalizeEmail(email, {
+    gmail_remove_dots: false,
+    gmail_remove_subaddress: false,
+    // gmail_convert_googlemaildotcom: true, default
+    outlookdotcom_remove_subaddress: false,
+    yahoo_remove_subaddress: false,
+    icloud_remove_subaddress: false,
+  })
diff --git a/webapp/components/utils/NormalizeEmail.js b/webapp/components/utils/NormalizeEmail.js
index da190085c..090ae9126 100644
--- a/webapp/components/utils/NormalizeEmail.js
+++ b/webapp/components/utils/NormalizeEmail.js
@@ -1,10 +1,11 @@
 import { normalizeEmail } from 'validator'
 
-export default (email) => normalizeEmail(email, {
-  gmail_remove_dots: false,
-  gmail_remove_subaddress: false,
-  // gmail_convert_googlemaildotcom: true, default
-  outlookdotcom_remove_subaddress: false,
-  yahoo_remove_subaddress: false,
-  icloud_remove_subaddress: false,
-})
+export default email =>
+  normalizeEmail(email, {
+    gmail_remove_dots: false,
+    gmail_remove_subaddress: false,
+    // gmail_convert_googlemaildotcom: true, default
+    outlookdotcom_remove_subaddress: false,
+    yahoo_remove_subaddress: false,
+    icloud_remove_subaddress: false,
+  })

From 973d3f899a245186fe8f7aa8be286c12220f73a2 Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Thu, 28 Nov 2019 14:02:11 +0100
Subject: [PATCH 103/174] Remove dots of gmail addresses

I had a chat with our moderator Daniel. He asks us to remove dots from
gmail accounts. He finds it more consistent and he has no problem to
write a mail to a gmail address without dots. He is OK to save the
email address different from how a user memorizes it.
---
 backend/src/schema/resolvers/helpers/normalizeEmail.js | 2 +-
 webapp/components/utils/NormalizeEmail.js              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/src/schema/resolvers/helpers/normalizeEmail.js b/backend/src/schema/resolvers/helpers/normalizeEmail.js
index 090ae9126..bdd12e991 100644
--- a/backend/src/schema/resolvers/helpers/normalizeEmail.js
+++ b/backend/src/schema/resolvers/helpers/normalizeEmail.js
@@ -2,7 +2,7 @@ import { normalizeEmail } from 'validator'
 
 export default email =>
   normalizeEmail(email, {
-    gmail_remove_dots: false,
+    // gmail_remove_dots: true, default
     gmail_remove_subaddress: false,
     // gmail_convert_googlemaildotcom: true, default
     outlookdotcom_remove_subaddress: false,
diff --git a/webapp/components/utils/NormalizeEmail.js b/webapp/components/utils/NormalizeEmail.js
index 090ae9126..f79c5118b 100644
--- a/webapp/components/utils/NormalizeEmail.js
+++ b/webapp/components/utils/NormalizeEmail.js
@@ -2,7 +2,7 @@ import { normalizeEmail } from 'validator'
 
 export default email =>
   normalizeEmail(email, {
-    gmail_remove_dots: false,
+    // gmail_remove_dots: false, default
     gmail_remove_subaddress: false,
     // gmail_convert_googlemaildotcom: true, default
     outlookdotcom_remove_subaddress: false,

From 89daa3356c25c5b8717c72c40ec10e2b4f11ac55 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Thu, 28 Nov 2019 16:10:33 +0100
Subject: [PATCH 104/174] Return reviews with reports, rename variables

- Instead of just returning the moderator who reviewed, we return the
review as well
---
 .../src/schema/resolvers/moderation.spec.js   | 61 ++++++++++++++-----
 backend/src/schema/resolvers/reports.js       | 37 ++++++-----
 backend/src/schema/resolvers/reports.spec.js  | 18 +++---
 backend/src/schema/types/type/REVIEWED.gql    |  1 -
 backend/src/schema/types/type/Report.gql      |  5 +-
 5 files changed, 80 insertions(+), 42 deletions(-)

diff --git a/backend/src/schema/resolvers/moderation.spec.js b/backend/src/schema/resolvers/moderation.spec.js
index 5b4a5d75a..397f642af 100644
--- a/backend/src/schema/resolvers/moderation.spec.js
+++ b/backend/src/schema/resolvers/moderation.spec.js
@@ -41,8 +41,11 @@ const reviewMutation = gql`
         createdAt
         updatedAt
         closed
-        reviewedByModerator {
-          id
+        reviewed {
+          createdAt
+          moderator {
+            id
+          }
         }
       }
     }
@@ -236,14 +239,19 @@ describe('moderate resources', () => {
           })
         })
 
-        it('returns .reviewedByModerator', async () => {
+        it('returns .reviewed', async () => {
           await expect(
             mutate({ mutation: reviewMutation, variables: disableVariables }),
           ).resolves.toMatchObject({
             data: {
               review: {
                 resource: { __typename: 'Comment', id: 'comment-id' },
-                report: { id: expect.any(String), reviewedByModerator: { id: 'moderator-id' } },
+                report: {
+                  id: expect.any(String),
+                  reviewed: expect.arrayContaining([
+                    { createdAt: expect.any(String), moderator: { id: 'moderator-id' } },
+                  ]),
+                },
               },
             },
           })
@@ -309,14 +317,19 @@ describe('moderate resources', () => {
           })
         })
 
-        it('returns .reviewedByModerator', async () => {
+        it('returns .reviewed', async () => {
           await expect(
             mutate({ mutation: reviewMutation, variables: disableVariables }),
           ).resolves.toMatchObject({
             data: {
               review: {
                 resource: { __typename: 'Post', id: 'post-id' },
-                report: { id: expect.any(String), reviewedByModerator: { id: 'moderator-id' } },
+                report: {
+                  id: expect.any(String),
+                  reviewed: expect.arrayContaining([
+                    { createdAt: expect.any(String), moderator: { id: 'moderator-id' } },
+                  ]),
+                },
               },
             },
           })
@@ -376,14 +389,19 @@ describe('moderate resources', () => {
           })
         })
 
-        it('returns .reviewedByModerator', async () => {
+        it('returns .reviewed', async () => {
           await expect(
             mutate({ mutation: reviewMutation, variables: disableVariables }),
           ).resolves.toMatchObject({
             data: {
               review: {
                 resource: { __typename: 'User', id: 'user-id' },
-                report: { id: expect.any(String), reviewedByModerator: { id: 'moderator-id' } },
+                report: {
+                  id: expect.any(String),
+                  reviewed: expect.arrayContaining([
+                    { createdAt: expect.any(String), moderator: { id: 'moderator-id' } },
+                  ]),
+                },
               },
             },
           })
@@ -509,14 +527,19 @@ describe('moderate resources', () => {
             })
           })
 
-          it('returns .reviewedByModerator', async () => {
+          it('returns .reviewed', async () => {
             await expect(
               mutate({ mutation: reviewMutation, variables: enableVariables }),
             ).resolves.toMatchObject({
               data: {
                 review: {
                   resource: { __typename: 'Comment', id: 'comment-id' },
-                  report: { id: expect.any(String), reviewedByModerator: { id: 'moderator-id' } },
+                  report: {
+                    id: expect.any(String),
+                    reviewed: expect.arrayContaining([
+                      { createdAt: expect.any(String), moderator: { id: 'moderator-id' } },
+                    ]),
+                  },
                 },
               },
             })
@@ -569,14 +592,19 @@ describe('moderate resources', () => {
             })
           })
 
-          it('returns .reviewedByModerator', async () => {
+          it('returns .reviewed', async () => {
             await expect(
               mutate({ mutation: reviewMutation, variables: enableVariables }),
             ).resolves.toMatchObject({
               data: {
                 review: {
                   resource: { __typename: 'Post', id: 'post-id' },
-                  report: { id: expect.any(String), reviewedByModerator: { id: 'moderator-id' } },
+                  report: {
+                    id: expect.any(String),
+                    reviewed: expect.arrayContaining([
+                      { createdAt: expect.any(String), moderator: { id: 'moderator-id' } },
+                    ]),
+                  },
                 },
               },
             })
@@ -628,14 +656,19 @@ describe('moderate resources', () => {
             })
           })
 
-          it('returns .reviewedByModerator', async () => {
+          it('returns .reviewed', async () => {
             await expect(
               mutate({ mutation: reviewMutation, variables: enableVariables }),
             ).resolves.toMatchObject({
               data: {
                 review: {
                   resource: { __typename: 'User', id: 'user-id' },
-                  report: { id: expect.any(String), reviewedByModerator: { id: 'moderator-id' } },
+                  report: {
+                    id: expect.any(String),
+                    reviewed: expect.arrayContaining([
+                      { createdAt: expect.any(String), moderator: { id: 'moderator-id' } },
+                    ]),
+                  },
                 },
               },
             })
diff --git a/backend/src/schema/resolvers/reports.js b/backend/src/schema/resolvers/reports.js
index 06c0a151e..c3ac3caac 100644
--- a/backend/src/schema/resolvers/reports.js
+++ b/backend/src/schema/resolvers/reports.js
@@ -86,11 +86,11 @@ export default {
     },
   },
   Report: {
-    reportsFiled: async (parent, _params, context, _resolveInfo) => {
-      if (typeof parent.reportsFiled !== 'undefined') return parent.reportsFiled
+    filed: async (parent, _params, context, _resolveInfo) => {
+      if (typeof parent.filed !== 'undefined') return parent.filed
       const session = context.driver.session()
       const { id } = parent
-      let reportsFiled
+      let filed
       const readTxPromise = session.readTransaction(async tx => {
         const allReportsTransactionResponse = await tx.run(
           `
@@ -107,7 +107,7 @@ export default {
       try {
         const txResult = await readTxPromise
         if (!txResult[0]) return null
-        reportsFiled = txResult.map(reportedRecord => {
+        filed = txResult.map(reportedRecord => {
           const { submitter, filed } = reportedRecord
           const relationshipWithNestedAttributes = {
             ...filed,
@@ -118,35 +118,42 @@ export default {
       } finally {
         session.close()
       }
-      return reportsFiled
+      return filed
     },
-    reviewedByModerator: async (parent, _params, context, _resolveInfo) => {
-      if (typeof parent.reviewedByModerator !== 'undefined') return parent.reviewedByModerator
+    reviewed: async (parent, _params, context, _resolveInfo) => {
+      if (typeof parent.reviewed !== 'undefined') return parent.reviewed
       const session = context.driver.session()
       const { id } = parent
-      let reviewedByModerator
+      let reviewed
       const readTxPromise = session.readTransaction(async tx => {
         const allReportsTransactionResponse = await tx.run(
           `
             MATCH (resource)<-[:BELONGS_TO]-(report:Report {id: $id})<-[review:REVIEWED]-(moderator:User)
-            RETURN moderator
+            RETURN moderator, review
             ORDER BY report.updatedAt DESC, review.updatedAt DESC
-            LIMIT 1
           `,
           { id },
         )
-        return allReportsTransactionResponse.records.map(
-          record => record.get('moderator').properties,
-        )
+        return allReportsTransactionResponse.records.map(record => ({
+          review: record.get('review').properties,
+          moderator: record.get('moderator').properties,
+        }))
       })
       try {
         const txResult = await readTxPromise
         if (!txResult[0]) return null
-        reviewedByModerator = txResult[0]
+        reviewed = txResult.map(reportedRecord => {
+          const { review, moderator } = reportedRecord
+          const relationshipWithNestedAttributes = {
+            ...review,
+            moderator,
+          }
+          return relationshipWithNestedAttributes
+        })
       } finally {
         session.close()
       }
-      return reviewedByModerator
+      return reviewed
     },
   },
 }
diff --git a/backend/src/schema/resolvers/reports.spec.js b/backend/src/schema/resolvers/reports.spec.js
index 648f63dce..648f55688 100644
--- a/backend/src/schema/resolvers/reports.spec.js
+++ b/backend/src/schema/resolvers/reports.spec.js
@@ -35,7 +35,7 @@ describe('file a report on a resource', () => {
             content
           }
         }
-        reportsFiled {
+        filed {
           submitter {
             id
           }
@@ -201,7 +201,7 @@ describe('file a report on a resource', () => {
             ).resolves.toMatchObject({
               data: {
                 fileReport: {
-                  reportsFiled: [
+                  filed: [
                     {
                       submitter: {
                         id: 'current-user-id',
@@ -243,7 +243,7 @@ describe('file a report on a resource', () => {
             ).resolves.toMatchObject({
               data: {
                 fileReport: {
-                  reportsFiled: [
+                  filed: [
                     {
                       reasonCategory: 'criminal_behavior_violation_german_law',
                     },
@@ -288,7 +288,7 @@ describe('file a report on a resource', () => {
             ).resolves.toMatchObject({
               data: {
                 fileReport: {
-                  reportsFiled: [
+                  filed: [
                     {
                       reasonDescription: 'My reason!',
                     },
@@ -312,7 +312,7 @@ describe('file a report on a resource', () => {
             ).resolves.toMatchObject({
               data: {
                 fileReport: {
-                  reportsFiled: [
+                  filed: [
                     {
                       reasonDescription: 'My reason !',
                     },
@@ -487,7 +487,7 @@ describe('file a report on a resource', () => {
               id
             }
           }
-          reportsFiled {
+          filed {
             submitter {
               id
             }
@@ -614,7 +614,7 @@ describe('file a report on a resource', () => {
                 __typename: 'User',
                 id: 'abusive-user-1',
               },
-              reportsFiled: expect.arrayContaining([
+              filed: expect.arrayContaining([
                 expect.objectContaining({
                   submitter: expect.objectContaining({
                     id: 'current-user-id',
@@ -635,7 +635,7 @@ describe('file a report on a resource', () => {
                 __typename: 'Post',
                 id: 'abusive-post-1',
               },
-              reportsFiled: expect.arrayContaining([
+              filed: expect.arrayContaining([
                 expect.objectContaining({
                   submitter: expect.objectContaining({
                     id: 'current-user-id',
@@ -656,7 +656,7 @@ describe('file a report on a resource', () => {
                 __typename: 'Comment',
                 id: 'abusive-comment-1',
               },
-              reportsFiled: expect.arrayContaining([
+              filed: expect.arrayContaining([
                 expect.objectContaining({
                   submitter: expect.objectContaining({
                     id: 'current-user-id',
diff --git a/backend/src/schema/types/type/REVIEWED.gql b/backend/src/schema/types/type/REVIEWED.gql
index d106e1f4c..aea005abe 100644
--- a/backend/src/schema/types/type/REVIEWED.gql
+++ b/backend/src/schema/types/type/REVIEWED.gql
@@ -6,7 +6,6 @@ type REVIEWED {
   report: Report
     # @cypher(statement: "MATCH (report:Report)<-[this:REVIEWED]-(:User) RETURN report")
   moderator: User
-  type: String
   resource: ReviewedResource
 }
 union ReviewedResource = User | Post | Comment
diff --git a/backend/src/schema/types/type/Report.gql b/backend/src/schema/types/type/Report.gql
index aa94415a4..49e5bdae3 100644
--- a/backend/src/schema/types/type/Report.gql
+++ b/backend/src/schema/types/type/Report.gql
@@ -5,10 +5,9 @@ type Report {
   rule: ReportRule!
   disable: Boolean!
   closed: Boolean!
-  reportsFiled: [FILED]
+  filed: [FILED]
+  reviewed: [REVIEWED]
   resource: ReportedResource
-  type: String
-  reviewedByModerator: User
 }
 
 union ReportedResource = User | Post | Comment

From 3d8435dde18bcf960efae1047a7f1566fa86db22 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Thu, 28 Nov 2019 16:13:48 +0100
Subject: [PATCH 105/174] Get frontend working with data from backend

---
 webapp/components/User/User.vue   |   2 +-
 webapp/graphql/Moderation.js      |  15 ++-
 webapp/pages/moderation/index.vue | 201 +++++++++---------------------
 3 files changed, 74 insertions(+), 144 deletions(-)

diff --git a/webapp/components/User/User.vue b/webapp/components/User/User.vue
index 23ac3ae40..d7a9274ed 100644
--- a/webapp/components/User/User.vue
+++ b/webapp/components/User/User.vue
@@ -13,7 +13,7 @@
           <div>
             <ds-text class="userinfo">
               <b class="username">{{ userName | truncate(18) }}</b>
-              <ds-text v-if="dateTime" size="small" color="soft">
+              <ds-text v-if="positionDatetime === 'sideward' && dateTime" size="small" color="soft">
                 <base-icon name="clock" />
                 <client-only>
                   <hc-relative-date-time :date-time="dateTime" />
diff --git a/webapp/graphql/Moderation.js b/webapp/graphql/Moderation.js
index 406f8d1fc..0b15265d8 100644
--- a/webapp/graphql/Moderation.js
+++ b/webapp/graphql/Moderation.js
@@ -10,6 +10,17 @@ export const reportListQuery = () => {
         updatedAt
         disable
         closed
+        reviewed {
+          disable
+          moderator {
+            id
+            slug
+            name
+            followedByCount
+            contributionsCount
+            commentedCount
+          }
+        }
         resource {
           __typename
           ... on User {
@@ -63,7 +74,7 @@ export const reportListQuery = () => {
             }
           }
         }
-        reportsFiled {
+        filed {
           submitter {
             id
             slug
@@ -91,7 +102,7 @@ export const reportMutation = () => {
         reasonCategory: $reasonCategory
         reasonDescription: $reasonDescription
       ) {
-        type
+        id
       }
     }
   `
diff --git a/webapp/pages/moderation/index.vue b/webapp/pages/moderation/index.vue
index 23699ef39..c5632f999 100644
--- a/webapp/pages/moderation/index.vue
+++ b/webapp/pages/moderation/index.vue
@@ -2,21 +2,21 @@
   <ds-card space="small">
     <ds-heading tag="h3">{{ $t('moderation.reports.name') }}</ds-heading>
     <table
-      v-if="resourcesClaims && resourcesClaims.length"
+      v-if="reports && reports.length"
       class="ds-table ds-table-condensed ds-table-bordered"
       cellspacing="0"
       cellpadding="0"
     >
       <colgroup><col width="" /></colgroup>
-      <template v-for="resourceClaims in resourcesClaims">
+      <template v-for="report in reports">
         <thead
           :class="[
-            resourceClaims.latestClaim.closed ? 'decision' : 'no-decision',
+            report.closed ? 'decision' : 'no-decision',
             'ds-table-col',
             'ds-table-head-col',
             'ds-table-head-col-border',
           ]"
-          :key="'thead-' + resourceClaims.resource.id"
+          :key="'thead-' + report.resource.id"
         >
           <tr valign="top">
             <th>
@@ -33,69 +33,70 @@
             </th>
           </tr>
         </thead>
-        <tbody :key="'tbody-' + resourceClaims.resource.id">
+        <tbody :key="'tbody-' + report.resource.id">
           <tr valign="top">
             <td class="ds-table-col ds-table-head-col ds-table-head-col-border">
               <!-- Icon -->
               <ds-text color="soft">
                 <ds-icon
-                  v-if="resourceClaims.type === 'Post'"
-                  v-tooltip="{ resourceClaims: $t('report.contribution.type'), placement: 'right' }"
+                  v-if="report.resource.__typename === 'Post'"
+                  v-tooltip="{ report: $t('report.contribution.type'), placement: 'right' }"
                   name="bookmark"
                 />
                 <ds-icon
-                  v-else-if="resourceClaims.type === 'Comment'"
-                  v-tooltip="{ resourceClaims: $t('report.comment.type'), placement: 'right' }"
+                  v-else-if="report.resource.__typename === 'Comment'"
+                  v-tooltip="{ report: $t('report.comment.type'), placement: 'right' }"
                   name="comments"
                 />
                 <ds-icon
-                  v-else-if="resourceClaims.type === 'User'"
-                  v-tooltip="{ resourceClaims: $t('report.user.type'), placement: 'right' }"
+                  v-else-if="report.resource.__typename === 'User'"
+                  v-tooltip="{ report: $t('report.user.type'), placement: 'right' }"
                   name="user"
                 />
-                <ds-icon v-if="resourceClaims.resource.disabled" name="eye-slash" class="ban" />
+                <ds-icon v-if="report.resource.disabled" name="eye-slash" class="ban" />
                 <ds-icon v-else name="eye" class="no-ban" />
               </ds-text>
             </td>
             <td class="ds-table-col ds-table-head-col-border">
               <!-- reported user or other resource -->
-              <div v-if="resourceClaims.type === 'Post' || resourceClaims.type === 'Comment'">
+              <div
+                v-if="
+                  report.resource.__typename === 'Post' || report.resource.__typename === 'Comment'
+                "
+              >
                 <nuxt-link
                   :to="{
                     name: 'post-id-slug',
                     params: {
-                      id:
-                        resourceClaims.type === 'Post'
-                          ? resourceClaims.post.id
-                          : resourceClaims.comment.post.id,
+                      id: report.resource.id,
                       slug:
-                        resourceClaims.type === 'Post'
-                          ? resourceClaims.post.slug
-                          : resourceClaims.comment.post.slug,
+                        report.resource.__typename === 'Post'
+                          ? report.resource.slug
+                          : report.resource.post.slug,
                     },
                     hash:
-                      resourceClaims.type === 'Comment'
-                        ? `#commentId-${resourceClaims.comment.id}`
+                      report.resource.__typename === 'Comment'
+                        ? `#commentId-${report.resource.id}`
                         : undefined,
                   }"
                 >
-                  <b v-if="resourceClaims.type === 'Post'">
-                    {{ resourceClaims.post.title | truncate(100) }}
+                  <b v-if="report.resource.__typename === 'Post'">
+                    {{ report.resource.title | truncate(100) }}
                   </b>
                   <b v-else>
-                    {{ resourceClaims.comment.contentExcerpt | removeHtml | truncate(100) }}
+                    {{ report.resource.contentExcerpt | removeHtml | truncate(100) }}
                   </b>
                 </nuxt-link>
               </div>
               <div v-else>
-                <hc-user :user="resourceClaims.user" :showAvatar="false" :trunc="30" />
+                <hc-user :user="report.resource" :showAvatar="false" :trunc="30" />
               </div>
             </td>
             <!-- contentBelongsToUser -->
             <td class="ds-table-col ds-table-head-col-border">
               <hc-user
-                v-if="resourceClaims.contentBelongsToUser"
-                :user="resourceClaims.contentBelongsToUser"
+                v-if="report.resource.__typename !== 'User'"
+                :user="report.resource.author"
                 :showAvatar="false"
                 :trunc="30"
               />
@@ -103,22 +104,22 @@
             </td>
             <td class="ds-table-col ds-table-head-col-border">
               <!-- latestClaim.closed -->
-              <b v-if="resourceClaims.latestClaim.closed">
+              <b v-if="report.closed">
                 {{ $t('moderation.reports.decided') }}
               </b>
               <ds-button
                 v-else
                 danger
                 class="confirm"
-                :icon="resourceClaims.resource.disabled ? 'eye-slash' : 'eye'"
-                @click="confirm(resourceClaims)"
+                :icon="report.resource.disabled ? 'eye-slash' : 'eye'"
+                @click="confirm(report)"
               >
                 {{ $t('moderation.reports.decideButton') }}
               </ds-button>
-              <!-- reviewedByModerator -->
-              <div v-if="resourceClaims.resource.reviewedByModerator">
+              <!-- reviewed -->
+              <div v-if="report.reviewed">
                 <br />
-                <div v-if="resourceClaims.latestClaim.disable">
+                <div v-if="report.resource.disabled">
                   <ds-icon name="eye-slash" class="ban" />
                   {{ $t('moderation.reports.disabledBy') }}
                 </div>
@@ -127,16 +128,16 @@
                   {{ $t('moderation.reports.enabledBy') }}
                 </div>
                 <hc-user
-                  :user="resourceClaims.resource.reviewedByModerator"
+                  :user="report.reviewed[0].moderator"
                   :showAvatar="false"
                   :trunc="30"
-                  :date-time="resourceClaims.latestClaim.updatedAt"
+                  :date-time="report.updatedAt"
                   positionDatetime="below"
                 />
               </div>
               <div v-else>
                 <br />
-                <div v-if="resourceClaims.resource.disabled">
+                <div v-if="report.resource.disabled">
                   <ds-icon name="eye-slash" class="ban" />
                   {{ $t('moderation.reports.disabled') }}
                 </div>
@@ -150,17 +151,17 @@
           <tr>
             <td class="ds-table-col ds-table-head-col-border"></td>
             <td class="ds-table-col ds-table-head-col-border" colspan="3">
-              <template v-for="(claim, indexClaim) in resourceClaims.claims">
-                <div :key="claim.id">
+              <template>
+                <div :key="report.id">
                   <!-- previousDecision -->
-                  <div v-if="indexClaim > 0">
+                  <div v-if="report.reviewed">
                     <ds-flex gutter="small">
                       <ds-flex-item width="25%">
                         <b>{{ $t('moderation.reports.previousDecision') }}</b>
                       </ds-flex-item>
                       <ds-flex-item>
                         <div>
-                          <span v-if="claim.disable">
+                          <span v-if="report.resource.disabled">
                             <ds-icon name="eye-slash" class="ban" />
                             {{ $t('moderation.reports.disabledAt') }}
                           </span>
@@ -171,7 +172,7 @@
                           <ds-text size="small" color="soft">
                             <ds-icon name="clock" />
                             <client-only>
-                              <hc-relative-date-time :date-time="claim.updatedAt" />
+                              <hc-relative-date-time :date-time="report.updatedAt" />
                             </client-only>
                           </ds-text>
                         </div>
@@ -179,7 +180,7 @@
                     </ds-flex>
                     <ds-space margin-bottom="x-small" />
                   </div>
-                  <ds-table :data="claim.reports" :fields="reportFields" condensed>
+                  <ds-table :data="report.filed" :fields="reportFields" condensed>
                     <!-- submitter -->
                     <template slot="submitter" slot-scope="scope">
                       <hc-user
@@ -226,7 +227,6 @@ export default {
   data() {
     return {
       reports: [],
-      resourcesClaims: [],
     }
   },
   computed: {
@@ -238,87 +238,9 @@ export default {
       }
     },
   },
-  // watch: {
-  //   reports: {
-  //     immediate: true,
-  //     handler(newReports) {
-  //       const newResourcesClaims = []
-  //       if (!newReports) return null
-  //       newReports.forEach(report => {
-  //         const resource =
-  //           report.type === 'User'
-  //             ? report.user
-  //             : report.type === 'Post'
-  //             ? report.post
-  //             : report.type === 'Comment'
-  //             ? report.comment
-  //             : undefined
-  //         let idxResource = newResourcesClaims.findIndex(
-  //           resourceClaims => resourceClaims.resource.id === resource.id,
-  //         )
-  //         // if resource is not in resource list, then add it
-  //         if (idxResource === -1) {
-  //           idxResource = newResourcesClaims.length
-  //           newResourcesClaims.push({
-  //             type: report.type,
-  //             resource,
-  //             user: report.user,
-  //             post: report.post,
-  //             comment: report.comment,
-  //             contentBelongsToUser: report.type === 'User' ? null : resource.author,
-  //             claims: [],
-  //           })
-  //         }
-  //         let idxClaim = newResourcesClaims[idxResource].claims.findIndex(
-  //           claim => claim.id === report.claim.id,
-  //         )
-  //         // if claim is not in claim list, then add it
-  //         if (idxClaim === -1) {
-  //           idxClaim = newResourcesClaims[idxResource].claims.length
-  //           newResourcesClaims[idxResource].claims.push({
-  //             // it is the same for all reports of a claim
-  //             id: report.claim.id,
-  //             createdAt: report.claim.createdAt,
-  //             updatedAt: report.claim.updatedAt,
-  //             disable: report.claim.disable,
-  //             closed: report.claim.closed,
-  //             reports: [],
-  //           })
-  //         }
-  //         newResourcesClaims[idxResource].claims[idxClaim].reports.push(report)
-  //       })
-
-  //       // sorting of resource claims and their reports
-  //       newResourcesClaims.forEach(resourceClaims => {
-  //         // latestClaim by updatedAt rules
-  //         resourceClaims.claims.sort((a, b) => new Date(b.updatedAt) - new Date(a.updatedAt))
-  //         resourceClaims.latestClaim = {
-  //           id: resourceClaims.claims[0].id,
-  //           createdAt: resourceClaims.claims[0].createdAt,
-  //           updatedAt: resourceClaims.claims[0].updatedAt,
-  //           disable: resourceClaims.claims[0].disable,
-  //           closed: resourceClaims.claims[0].closed,
-  //         }
-  //         // display claims always by starting with latest createdAt
-  //         resourceClaims.claims.sort((a, b) => new Date(b.createdAt) - new Date(a.createdAt))
-
-  //         resourceClaims.claims.forEach(claim => {
-  //           // display reports always by starting with latest createdAt
-  //           claim.reports.sort((a, b) => new Date(b.createdAt) - new Date(a.createdAt))
-  //         })
-  //       })
-  //       // display resources by starting with claims by their latest createdAt
-  //       newResourcesClaims.sort(
-  //         (a, b) => new Date(b.claims[0].createdAt) - new Date(a.claims[0].createdAt),
-  //       )
-
-  //       this.resourcesClaims = newResourcesClaims
-  //     },
-  //   },
-  // },
   methods: {
-    confirm(resourceClaims) {
-      this.openModal(resourceClaims)
+    confirm(report) {
+      this.openModal(report)
     },
     async confirmCallback(resourceId) {
       this.$apollo
@@ -332,29 +254,29 @@ export default {
         })
         .catch(error => this.$toast.error(error.message))
     },
-    openModal(resourceClaims) {
+    openModal(report) {
       const identStart =
         'moderation.reports.decideModal.' +
-        resourceClaims.type +
+        report.resource.__typename +
         '.' +
-        (resourceClaims.latestClaim.disable ? 'disable' : 'enable')
+        (report.resource.disabled ? 'disable' : 'enable')
       this.$store.commit('modal/SET_OPEN', {
         name: 'confirm',
         data: {
-          type: resourceClaims.type,
-          resource: resourceClaims.resource,
+          type: report.resource.__typename,
+          resource: report.resource,
           modalData: {
             titleIdent: identStart + '.title',
             messageIdent: identStart + '.message',
             messageParams: {
               name:
-                resourceClaims.type === 'User'
-                  ? resourceClaims.user.name
-                  : resourceClaims.type === 'Post'
-                  ? this.$filters.truncate(resourceClaims.post.title, 30)
-                  : resourceClaims.type === 'Comment'
+                report.resource.__typename === 'User'
+                  ? report.resource.name
+                  : report.resource.__typename === 'Post'
+                  ? this.$filters.truncate(report.resource.title, 30)
+                  : report.resource.__typename === 'Comment'
                   ? this.$filters.truncate(
-                      this.$filters.removeHtml(resourceClaims.comment.contentExcerpt),
+                      this.$filters.removeHtml(report.resource.contentExcerpt),
                       30,
                     )
                   : '',
@@ -362,10 +284,10 @@ export default {
             buttons: {
               confirm: {
                 danger: true,
-                icon: resourceClaims.resource.disabled ? 'eye-slash' : 'eye',
+                icon: report.resource.disabled ? 'eye-slash' : 'eye',
                 textIdent: 'moderation.reports.decideModal.submit',
                 callback: () => {
-                  this.confirmCallback(resourceClaims.resource.id)
+                  this.confirmCallback(report.resource.id)
                 },
               },
               cancel: {
@@ -380,11 +302,8 @@ export default {
     },
   },
   apollo: {
-    reports: {
+    reportsList: {
       query: reportListQuery(),
-      variables() {
-        return {}
-      },
       update({ reports }) {
         this.reports = reports
       },

From 9401d4e1e1894d1be490b07a72e1ae7ef9bf22d9 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Thu, 28 Nov 2019 17:38:44 +0100
Subject: [PATCH 106/174] [WIP] Extract code into own components

---
 .../features/ReportList/ReportList.vue        | 109 ++++++
 .../features/ReportsTable/ReportsTable.vue    | 210 ++++++++++++
 .../generic/FiledTable/FiledTable.vue         |  44 +++
 webapp/graphql/Moderation.js                  |   3 +-
 webapp/pages/moderation/index.vue             | 319 +-----------------
 5 files changed, 368 insertions(+), 317 deletions(-)
 create mode 100644 webapp/components/features/ReportList/ReportList.vue
 create mode 100644 webapp/components/features/ReportsTable/ReportsTable.vue
 create mode 100644 webapp/components/generic/FiledTable/FiledTable.vue

diff --git a/webapp/components/features/ReportList/ReportList.vue b/webapp/components/features/ReportList/ReportList.vue
new file mode 100644
index 000000000..bf971c9bd
--- /dev/null
+++ b/webapp/components/features/ReportList/ReportList.vue
@@ -0,0 +1,109 @@
+<template>
+  <reports-table v-if="reports && reports.length" :reports="reports" @confirm="confirm" />
+  <hc-empty v-else icon="alert" :message="$t('moderation.reports.empty')" />
+</template>
+<script>
+import ReportsTable from '~/components/features/ReportsTable/ReportsTable'
+import HcEmpty from '~/components/Empty/Empty'
+import { reportsListQuery, reviewMutation } from '~/graphql/Moderation.js'
+
+export default {
+  components: {
+    ReportsTable,
+    HcEmpty,
+  },
+  data() {
+    return {
+      reports: [],
+    }
+  },
+  methods: {
+    confirm(report) {
+      this.openModal(report)
+    },
+    async confirmCallback(resource) {
+      const { disabled: disable, id: resourceId } = resource
+      this.$apollo
+        .mutate({
+          mutation: reviewMutation(),
+          variables: { disable, resourceId, closed: true },
+        })
+        .then(() => {
+          this.$toast.success(this.$t('moderation.reports.DecisionSuccess'))
+          this.$apollo.queries.reportsList.refetch()
+        })
+        .catch(error => this.$toast.error(error.message))
+    },
+    openModal(report) {
+      const identStart =
+        'moderation.reports.decideModal.' +
+        report.resource.__typename +
+        '.' +
+        (report.resource.disabled ? 'disable' : 'enable')
+      this.$store.commit('modal/SET_OPEN', {
+        name: 'confirm',
+        data: {
+          type: report.resource.__typename,
+          resource: report.resource,
+          modalData: {
+            titleIdent: identStart + '.title',
+            messageIdent: identStart + '.message',
+            messageParams: {
+              name:
+                report.resource.__typename === 'User'
+                  ? report.resource.name
+                  : report.resource.__typename === 'Post'
+                  ? this.$filters.truncate(report.resource.title, 30)
+                  : report.resource.__typename === 'Comment'
+                  ? this.$filters.truncate(
+                      this.$filters.removeHtml(report.resource.contentExcerpt),
+                      30,
+                    )
+                  : '',
+            },
+            buttons: {
+              confirm: {
+                danger: true,
+                icon: report.resource.disabled ? 'eye-slash' : 'eye',
+                textIdent: 'moderation.reports.decideModal.submit',
+                callback: () => {
+                  this.confirmCallback(report.resource)
+                },
+              },
+              cancel: {
+                icon: 'close',
+                textIdent: 'moderation.reports.decideModal.cancel',
+                callback: () => {},
+              },
+            },
+          },
+        },
+      })
+    },
+  },
+  apollo: {
+    reportsList: {
+      query: reportsListQuery(),
+      update({ reports }) {
+        this.reports = reports
+      },
+      fetchPolicy: 'cache-and-network',
+    },
+  },
+}
+</script>
+
+<style lang="scss">
+.decision {
+  color: $color-secondary;
+}
+.no-decision {
+  color: $color-warning;
+}
+.ban {
+  color: $color-danger;
+}
+.no-ban {
+  color: $color-success;
+}
+</style>
diff --git a/webapp/components/features/ReportsTable/ReportsTable.vue b/webapp/components/features/ReportsTable/ReportsTable.vue
new file mode 100644
index 000000000..5b62f024c
--- /dev/null
+++ b/webapp/components/features/ReportsTable/ReportsTable.vue
@@ -0,0 +1,210 @@
+<template>
+  <table class="ds-table ds-table-condensed ds-table-bordered" cellspacing="0" cellpadding="0">
+    <colgroup><col width="" /></colgroup>
+    <template v-for="report in reports">
+      <thead
+        :class="[
+          report.closed ? 'decision' : 'no-decision',
+          'ds-table-col',
+          'ds-table-head-col',
+          'ds-table-head-col-border',
+        ]"
+        :key="'thead-' + report.resource.id"
+      >
+        <tr valign="top">
+          <th>
+            {{ $t('moderation.reports.typeRowHeadline') }}
+          </th>
+          <th>
+            {{ $t('moderation.reports.contentRowHeadline') }}
+          </th>
+          <th>
+            {{ $t('moderation.reports.authorRowHeadline') }}
+          </th>
+          <th>
+            {{ $t('moderation.reports.decisionRowHeadline') }}
+          </th>
+        </tr>
+      </thead>
+      <tbody :key="'tbody-' + report.resource.id">
+        <tr valign="top">
+          <td class="ds-table-col ds-table-head-col ds-table-head-col-border">
+            <!-- Icon -->
+            <ds-text color="soft">
+              <ds-icon
+                v-if="report.resource.__typename === 'Post'"
+                v-tooltip="{ report: $t('report.contribution.type'), placement: 'right' }"
+                name="bookmark"
+              />
+              <ds-icon
+                v-else-if="report.resource.__typename === 'Comment'"
+                v-tooltip="{ report: $t('report.comment.type'), placement: 'right' }"
+                name="comments"
+              />
+              <ds-icon
+                v-else-if="report.resource.__typename === 'User'"
+                v-tooltip="{ report: $t('report.user.type'), placement: 'right' }"
+                name="user"
+              />
+              <ds-icon v-if="report.resource.disabled" name="eye-slash" class="ban" />
+              <ds-icon v-else name="eye" class="no-ban" />
+            </ds-text>
+          </td>
+          <td class="ds-table-col ds-table-head-col-border">
+            <!-- reported user or other resource -->
+            <div
+              v-if="
+                report.resource.__typename === 'Post' || report.resource.__typename === 'Comment'
+              "
+            >
+              <nuxt-link
+                :to="{
+                  name: 'post-id-slug',
+                  params: {
+                    id: report.resource.id,
+                    slug:
+                      report.resource.__typename === 'Post'
+                        ? report.resource.slug
+                        : report.resource.post.slug,
+                  },
+                  hash:
+                    report.resource.__typename === 'Comment'
+                      ? `#commentId-${report.resource.id}`
+                      : undefined,
+                }"
+              >
+                <b v-if="report.resource.__typename === 'Post'">
+                  {{ report.resource.title | truncate(100) }}
+                </b>
+                <b v-else>
+                  {{ report.resource.contentExcerpt | removeHtml | truncate(100) }}
+                </b>
+              </nuxt-link>
+            </div>
+            <div v-else>
+              <client-only>
+                <hc-user :user="report.resource" :showAvatar="false" :trunc="30" />
+              </client-only>
+            </div>
+            <!-- <div v-if="report.reviewed">
+              <ds-space margin="x-large"/>
+              <ds-flex gutter="small">
+                <ds-flex-item width="25%">
+                  <b>{{ $t('moderation.reports.previousDecision') }}</b>
+                </ds-flex-item>
+                <ds-flex-item>
+                  <div>
+                    <span v-if="report.resource.disabled">
+                      <ds-icon name="eye-slash" class="ban" />
+                      {{ $t('moderation.reports.disabledAt') }}
+                    </span>
+                    <span v-else>
+                      <ds-icon name="eye" class="no-ban" />
+                      {{ $t('moderation.reports.enabledAt') }}
+                    </span>
+                    <ds-text size="small" color="soft">
+                      <ds-icon name="clock" />
+                      <client-only>
+                        <hc-relative-date-time :date-time="report.updatedAt" />
+                      </client-only>
+                    </ds-text>
+                  </div>
+                </ds-flex-item>
+              </ds-flex>
+              <ds-space margin-bottom="x-small" />
+            </div> -->
+          </td>
+          <!-- contentBelongsToUser -->
+          <td class="ds-table-col ds-table-head-col-border">
+            <client-only>
+              <hc-user
+                v-if="report.resource.__typename !== 'User'"
+                :user="report.resource.author"
+                :showAvatar="false"
+                :trunc="30"
+              />
+              <span v-else>—</span>
+            </client-only>
+          </td>
+          <td class="ds-table-col ds-table-head-col-border">
+            <!-- latestClaim.closed -->
+            <b v-if="report.closed">
+              {{ $t('moderation.reports.decided') }}
+            </b>
+            <ds-button
+              v-else
+              danger
+              class="confirm"
+              :icon="report.resource.disabled ? 'eye-slash' : 'eye'"
+              @click="confirm(report)"
+            >
+              {{ $t('moderation.reports.decideButton') }}
+            </ds-button>
+            <!-- reviewed -->
+            <div v-if="report.reviewed">
+              <br />
+              <div v-if="report.resource.disabled">
+                <ds-icon name="eye-slash" class="ban" />
+                {{ $t('moderation.reports.disabledBy') }}
+              </div>
+              <div v-else>
+                <ds-icon name="eye" class="no-ban" />
+                {{ $t('moderation.reports.enabledBy') }}
+              </div>
+              <client-only>
+                <hc-user
+                  :user="report.reviewed[0].moderator"
+                  :showAvatar="false"
+                  :trunc="30"
+                  :date-time="report.updatedAt"
+                  positionDatetime="below"
+                />
+              </client-only>
+            </div>
+            <div v-else>
+              <br />
+              <div v-if="report.resource.disabled">
+                <ds-icon name="eye-slash" class="ban" />
+                {{ $t('moderation.reports.disabled') }}
+              </div>
+              <div v-else>
+                <ds-icon name="eye" class="no-ban" />
+                {{ $t('moderation.reports.enabled') }}
+              </div>
+            </div>
+          </td>
+        </tr>
+        <tr>
+          <td class="ds-table-col ds-table-head-col-border"></td>
+          <td class="ds-table-col ds-table-head-col-border" colspan="3">
+            <div>
+              <ds-space margin-bottom="base" />
+              <filed-table :filed="report.filed" />
+            </div>
+          </td>
+        </tr>
+      </tbody>
+    </template>
+  </table>
+</template>
+<script>
+// import HcRelativeDateTime from '~/components/RelativeDateTime'
+import HcUser from '~/components/User/User'
+import FiledTable from '~/components/generic/FiledTable/FiledTable'
+
+export default {
+  components: {
+    // HcRelativeDateTime,
+    HcUser,
+    FiledTable,
+  },
+  props: {
+    reports: { type: Array, default: () => [] },
+  },
+  methods: {
+    confirm(report) {
+      this.$emit('confirm', report)
+    },
+  },
+}
+</script>
diff --git a/webapp/components/generic/FiledTable/FiledTable.vue b/webapp/components/generic/FiledTable/FiledTable.vue
new file mode 100644
index 000000000..cc33ae505
--- /dev/null
+++ b/webapp/components/generic/FiledTable/FiledTable.vue
@@ -0,0 +1,44 @@
+<template>
+  <ds-table :data="filed" :fields="reportFields" condensed>
+    <template #submitter="scope">
+      <ds-space margin-bottom="x-large">
+        <client-only>
+          <hc-user
+            :user="scope.row.submitter"
+            :showAvatar="false"
+            :trunc="30"
+            :date-time="scope.row.createdAt"
+            :positionDatetime="'below'"
+          />
+        </client-only>
+      </ds-space>
+    </template>
+    <template #reasonCategory="scope">
+      {{ $t('report.reason.category.options.' + scope.row.reasonCategory) }}
+    </template>
+    <template #reasonDescription="scope">
+      {{ scope.row.reasonDescription.length ? scope.row.reasonDescription : '—' }}
+    </template>
+  </ds-table>
+</template>
+<script>
+import HcUser from '~/components/User/User'
+
+export default {
+  components: {
+    HcUser,
+  },
+  props: {
+    filed: { type: Array, default: () => [] },
+  },
+  computed: {
+    reportFields() {
+      return {
+        submitter: this.$t('moderation.reports.submitter'),
+        reasonCategory: this.$t('moderation.reports.reasonCategory'),
+        reasonDescription: this.$t('moderation.reports.reasonDescription'),
+      }
+    },
+  },
+}
+</script>
diff --git a/webapp/graphql/Moderation.js b/webapp/graphql/Moderation.js
index 0b15265d8..da2054d66 100644
--- a/webapp/graphql/Moderation.js
+++ b/webapp/graphql/Moderation.js
@@ -1,6 +1,6 @@
 import gql from 'graphql-tag'
 
-export const reportListQuery = () => {
+export const reportsListQuery = () => {
   // no limit for the moment like before: "reports(first: 20, orderBy: createdAt_desc)"
   return gql`
     query {
@@ -113,6 +113,7 @@ export const reviewMutation = () => {
     mutation($resourceId: ID!, $disable: Boolean, $closed: Boolean) {
       review(resourceId: $resourceId, disable: $disable, closed: $closed) {
         disable
+        closed
       }
     }
   `
diff --git a/webapp/pages/moderation/index.vue b/webapp/pages/moderation/index.vue
index c5632f999..bb08a15a1 100644
--- a/webapp/pages/moderation/index.vue
+++ b/webapp/pages/moderation/index.vue
@@ -1,329 +1,16 @@
 <template>
   <ds-card space="small">
     <ds-heading tag="h3">{{ $t('moderation.reports.name') }}</ds-heading>
-    <table
-      v-if="reports && reports.length"
-      class="ds-table ds-table-condensed ds-table-bordered"
-      cellspacing="0"
-      cellpadding="0"
-    >
-      <colgroup><col width="" /></colgroup>
-      <template v-for="report in reports">
-        <thead
-          :class="[
-            report.closed ? 'decision' : 'no-decision',
-            'ds-table-col',
-            'ds-table-head-col',
-            'ds-table-head-col-border',
-          ]"
-          :key="'thead-' + report.resource.id"
-        >
-          <tr valign="top">
-            <th>
-              {{ $t('moderation.reports.typeRowHeadline') }}
-            </th>
-            <th>
-              {{ $t('moderation.reports.contentRowHeadline') }}
-            </th>
-            <th>
-              {{ $t('moderation.reports.authorRowHeadline') }}
-            </th>
-            <th>
-              {{ $t('moderation.reports.decisionRowHeadline') }}
-            </th>
-          </tr>
-        </thead>
-        <tbody :key="'tbody-' + report.resource.id">
-          <tr valign="top">
-            <td class="ds-table-col ds-table-head-col ds-table-head-col-border">
-              <!-- Icon -->
-              <ds-text color="soft">
-                <ds-icon
-                  v-if="report.resource.__typename === 'Post'"
-                  v-tooltip="{ report: $t('report.contribution.type'), placement: 'right' }"
-                  name="bookmark"
-                />
-                <ds-icon
-                  v-else-if="report.resource.__typename === 'Comment'"
-                  v-tooltip="{ report: $t('report.comment.type'), placement: 'right' }"
-                  name="comments"
-                />
-                <ds-icon
-                  v-else-if="report.resource.__typename === 'User'"
-                  v-tooltip="{ report: $t('report.user.type'), placement: 'right' }"
-                  name="user"
-                />
-                <ds-icon v-if="report.resource.disabled" name="eye-slash" class="ban" />
-                <ds-icon v-else name="eye" class="no-ban" />
-              </ds-text>
-            </td>
-            <td class="ds-table-col ds-table-head-col-border">
-              <!-- reported user or other resource -->
-              <div
-                v-if="
-                  report.resource.__typename === 'Post' || report.resource.__typename === 'Comment'
-                "
-              >
-                <nuxt-link
-                  :to="{
-                    name: 'post-id-slug',
-                    params: {
-                      id: report.resource.id,
-                      slug:
-                        report.resource.__typename === 'Post'
-                          ? report.resource.slug
-                          : report.resource.post.slug,
-                    },
-                    hash:
-                      report.resource.__typename === 'Comment'
-                        ? `#commentId-${report.resource.id}`
-                        : undefined,
-                  }"
-                >
-                  <b v-if="report.resource.__typename === 'Post'">
-                    {{ report.resource.title | truncate(100) }}
-                  </b>
-                  <b v-else>
-                    {{ report.resource.contentExcerpt | removeHtml | truncate(100) }}
-                  </b>
-                </nuxt-link>
-              </div>
-              <div v-else>
-                <hc-user :user="report.resource" :showAvatar="false" :trunc="30" />
-              </div>
-            </td>
-            <!-- contentBelongsToUser -->
-            <td class="ds-table-col ds-table-head-col-border">
-              <hc-user
-                v-if="report.resource.__typename !== 'User'"
-                :user="report.resource.author"
-                :showAvatar="false"
-                :trunc="30"
-              />
-              <span v-else>—</span>
-            </td>
-            <td class="ds-table-col ds-table-head-col-border">
-              <!-- latestClaim.closed -->
-              <b v-if="report.closed">
-                {{ $t('moderation.reports.decided') }}
-              </b>
-              <ds-button
-                v-else
-                danger
-                class="confirm"
-                :icon="report.resource.disabled ? 'eye-slash' : 'eye'"
-                @click="confirm(report)"
-              >
-                {{ $t('moderation.reports.decideButton') }}
-              </ds-button>
-              <!-- reviewed -->
-              <div v-if="report.reviewed">
-                <br />
-                <div v-if="report.resource.disabled">
-                  <ds-icon name="eye-slash" class="ban" />
-                  {{ $t('moderation.reports.disabledBy') }}
-                </div>
-                <div v-else>
-                  <ds-icon name="eye" class="no-ban" />
-                  {{ $t('moderation.reports.enabledBy') }}
-                </div>
-                <hc-user
-                  :user="report.reviewed[0].moderator"
-                  :showAvatar="false"
-                  :trunc="30"
-                  :date-time="report.updatedAt"
-                  positionDatetime="below"
-                />
-              </div>
-              <div v-else>
-                <br />
-                <div v-if="report.resource.disabled">
-                  <ds-icon name="eye-slash" class="ban" />
-                  {{ $t('moderation.reports.disabled') }}
-                </div>
-                <div v-else>
-                  <ds-icon name="eye" class="no-ban" />
-                  {{ $t('moderation.reports.enabled') }}
-                </div>
-              </div>
-            </td>
-          </tr>
-          <tr>
-            <td class="ds-table-col ds-table-head-col-border"></td>
-            <td class="ds-table-col ds-table-head-col-border" colspan="3">
-              <template>
-                <div :key="report.id">
-                  <!-- previousDecision -->
-                  <div v-if="report.reviewed">
-                    <ds-flex gutter="small">
-                      <ds-flex-item width="25%">
-                        <b>{{ $t('moderation.reports.previousDecision') }}</b>
-                      </ds-flex-item>
-                      <ds-flex-item>
-                        <div>
-                          <span v-if="report.resource.disabled">
-                            <ds-icon name="eye-slash" class="ban" />
-                            {{ $t('moderation.reports.disabledAt') }}
-                          </span>
-                          <span v-else>
-                            <ds-icon name="eye" class="no-ban" />
-                            {{ $t('moderation.reports.enabledAt') }}
-                          </span>
-                          <ds-text size="small" color="soft">
-                            <ds-icon name="clock" />
-                            <client-only>
-                              <hc-relative-date-time :date-time="report.updatedAt" />
-                            </client-only>
-                          </ds-text>
-                        </div>
-                      </ds-flex-item>
-                    </ds-flex>
-                    <ds-space margin-bottom="x-small" />
-                  </div>
-                  <ds-table :data="report.filed" :fields="reportFields" condensed>
-                    <!-- submitter -->
-                    <template slot="submitter" slot-scope="scope">
-                      <hc-user
-                        :user="scope.row.submitter"
-                        :showAvatar="false"
-                        :trunc="30"
-                        :date-time="scope.row.createdAt"
-                        :positionDatetime="'below'"
-                      />
-                    </template>
-                    <!-- reasonCategory -->
-                    <template slot="reasonCategory" slot-scope="scope">
-                      {{ $t('report.reason.category.options.' + scope.row.reasonCategory) }}
-                    </template>
-                    <!-- reasonDescription -->
-                    <template slot="reasonDescription" slot-scope="scope">
-                      {{ scope.row.reasonDescription.length ? scope.row.reasonDescription : '—' }}
-                    </template>
-                  </ds-table>
-                  <ds-space margin-bottom="base" />
-                </div>
-              </template>
-            </td>
-          </tr>
-        </tbody>
-      </template>
-    </table>
-    <hc-empty v-else icon="alert" :message="$t('moderation.reports.empty')" />
+    <report-list />
   </ds-card>
 </template>
 
 <script>
-import HcEmpty from '~/components/Empty/Empty'
-import HcRelativeDateTime from '~/components/RelativeDateTime'
-import HcUser from '~/components/User/User'
-import { reportListQuery, reviewMutation } from '~/graphql/Moderation.js'
+import ReportList from '~/components/features/ReportList/ReportList'
 
 export default {
   components: {
-    HcEmpty,
-    HcRelativeDateTime,
-    HcUser,
-  },
-  data() {
-    return {
-      reports: [],
-    }
-  },
-  computed: {
-    reportFields() {
-      return {
-        submitter: this.$t('moderation.reports.submitter'),
-        reasonCategory: this.$t('moderation.reports.reasonCategory'),
-        reasonDescription: this.$t('moderation.reports.reasonDescription'),
-      }
-    },
-  },
-  methods: {
-    confirm(report) {
-      this.openModal(report)
-    },
-    async confirmCallback(resourceId) {
-      this.$apollo
-        .mutate({
-          mutation: reviewMutation(),
-          variables: { resourceId, closed: true },
-        })
-        .then(() => {
-          this.$toast.success(this.$t('moderation.reports.DecisionSuccess'))
-          this.$apollo.queries.reports.refetch()
-        })
-        .catch(error => this.$toast.error(error.message))
-    },
-    openModal(report) {
-      const identStart =
-        'moderation.reports.decideModal.' +
-        report.resource.__typename +
-        '.' +
-        (report.resource.disabled ? 'disable' : 'enable')
-      this.$store.commit('modal/SET_OPEN', {
-        name: 'confirm',
-        data: {
-          type: report.resource.__typename,
-          resource: report.resource,
-          modalData: {
-            titleIdent: identStart + '.title',
-            messageIdent: identStart + '.message',
-            messageParams: {
-              name:
-                report.resource.__typename === 'User'
-                  ? report.resource.name
-                  : report.resource.__typename === 'Post'
-                  ? this.$filters.truncate(report.resource.title, 30)
-                  : report.resource.__typename === 'Comment'
-                  ? this.$filters.truncate(
-                      this.$filters.removeHtml(report.resource.contentExcerpt),
-                      30,
-                    )
-                  : '',
-            },
-            buttons: {
-              confirm: {
-                danger: true,
-                icon: report.resource.disabled ? 'eye-slash' : 'eye',
-                textIdent: 'moderation.reports.decideModal.submit',
-                callback: () => {
-                  this.confirmCallback(report.resource.id)
-                },
-              },
-              cancel: {
-                icon: 'close',
-                textIdent: 'moderation.reports.decideModal.cancel',
-                callback: () => {},
-              },
-            },
-          },
-        },
-      })
-    },
-  },
-  apollo: {
-    reportsList: {
-      query: reportListQuery(),
-      update({ reports }) {
-        this.reports = reports
-      },
-      fetchPolicy: 'cache-and-network',
-    },
+    ReportList,
   },
 }
 </script>
-
-<style lang="scss">
-.decision {
-  color: $color-secondary;
-}
-.no-decision {
-  color: $color-warning;
-}
-.ban {
-  color: $color-danger;
-}
-.no-ban {
-  color: $color-success;
-}
-</style>

From 76414dbec7872c08fc0f045c1b122c6188b75c62 Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Thu, 28 Nov 2019 18:07:00 +0100
Subject: [PATCH 107/174] Fix lint

---
 backend/src/middleware/permissionsMiddleware.js   | 2 +-
 backend/src/schema/resolvers/registration.spec.js | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/backend/src/middleware/permissionsMiddleware.js b/backend/src/middleware/permissionsMiddleware.js
index 59a425494..daa614329 100644
--- a/backend/src/middleware/permissionsMiddleware.js
+++ b/backend/src/middleware/permissionsMiddleware.js
@@ -1,4 +1,4 @@
-import { rule, shield, deny, allow, and, or, not } from 'graphql-shield'
+import { rule, shield, deny, allow, or } from 'graphql-shield'
 import { neode } from '../bootstrap/neo4j'
 import CONFIG from '../config'
 
diff --git a/backend/src/schema/resolvers/registration.spec.js b/backend/src/schema/resolvers/registration.spec.js
index 684fea0e8..35b16b9bb 100644
--- a/backend/src/schema/resolvers/registration.spec.js
+++ b/backend/src/schema/resolvers/registration.spec.js
@@ -9,7 +9,6 @@ const neode = getNeode()
 
 let mutate
 let authenticatedUser
-let user
 let variables
 const driver = getDriver()
 

From 2885661e60fbb5c59fcf02e7dcff813d6d873afe Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 29 Nov 2019 04:22:40 +0000
Subject: [PATCH 108/174] build(deps): bump neo4j in /neo4j

Bumps neo4j from 3.5.12-enterprise to 3.5.13-enterprise.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 neo4j/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/neo4j/Dockerfile b/neo4j/Dockerfile
index 5d4827586..a180a18a2 100644
--- a/neo4j/Dockerfile
+++ b/neo4j/Dockerfile
@@ -1,4 +1,4 @@
-FROM neo4j:3.5.12-enterprise
+FROM neo4j:3.5.13-enterprise
 LABEL Description="Neo4J database of the Social Network Human-Connection.org with preinstalled database constraints and indices" Vendor="Human Connection gGmbH" Version="0.0.1" Maintainer="Human Connection gGmbH (developer@human-connection.org)"
 
 ARG BUILD_COMMIT

From 0d327a9027d81ea574aef20fa4b48d4e0e4c5bb8 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 29 Nov 2019 04:24:08 +0000
Subject: [PATCH 109/174] build(deps-dev): bump @vue/server-test-utils in
 /webapp

Bumps [@vue/server-test-utils](https://github.com/vuejs/vue-test-utils/tree/HEAD/packages/server-test-utils) from 1.0.0-beta.29 to 1.0.0-beta.30.
- [Release notes](https://github.com/vuejs/vue-test-utils/releases)
- [Changelog](https://github.com/vuejs/vue-test-utils/blob/dev/packages/server-test-utils/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-test-utils/commits/v1.0.0-beta.30/packages/server-test-utils)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 webapp/package.json |  2 +-
 webapp/yarn.lock    | 16 ++++++++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/webapp/package.json b/webapp/package.json
index a8fbfbcf5..7cc5317ca 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -106,7 +106,7 @@
     "@storybook/vue": "~5.2.6",
     "@vue/cli-shared-utils": "~4.0.5",
     "@vue/eslint-config-prettier": "~6.0.0",
-    "@vue/server-test-utils": "~1.0.0-beta.29",
+    "@vue/server-test-utils": "~1.0.0-beta.30",
     "@vue/test-utils": "~1.0.0-beta.29",
     "async-validator": "^3.2.2",
     "babel-core": "~7.0.0-bridge.0",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index a45b3e378..fd9c0289d 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -2568,6 +2568,13 @@
   dependencies:
     "@types/node" "*"
 
+"@types/cheerio@^0.22.10":
+  version "0.22.14"
+  resolved "https://registry.yarnpkg.com/@types/cheerio/-/cheerio-0.22.14.tgz#d150889891e7db892c6a0b16bd5583cc70b3fc44"
+  integrity sha512-SVtcP2fvPYrebTwpyqxjxb7K5v3ZOAdH409yAEWFPpZThCSGa1K2IFfx6Rg6ttvThCBQXP4fU9WF94sqLoiQGg==
+  dependencies:
+    "@types/node" "*"
+
 "@types/connect@*":
   version "3.4.32"
   resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.32.tgz#aa0e9616b9435ccad02bc52b5b454ffc2c70ba28"
@@ -3001,11 +3008,12 @@
   dependencies:
     eslint-config-prettier "^6.0.0"
 
-"@vue/server-test-utils@~1.0.0-beta.29":
-  version "1.0.0-beta.29"
-  resolved "https://registry.yarnpkg.com/@vue/server-test-utils/-/server-test-utils-1.0.0-beta.29.tgz#8a61a9900992b742cda7c143593db1c5e4a019bd"
-  integrity sha512-N6e2cixTnz7+mos0wL+R3LM/2op+f3ym1aSQYuNfksZzvX81lrQtjGr6Aszv0+1Ryms+WrqlL18Jb/MY8XyXaQ==
+"@vue/server-test-utils@~1.0.0-beta.30":
+  version "1.0.0-beta.30"
+  resolved "https://registry.yarnpkg.com/@vue/server-test-utils/-/server-test-utils-1.0.0-beta.30.tgz#960a6383de81ba5ff763bdd6e961b9443e98fa82"
+  integrity sha512-H5vABB3uWbr+JlpN9pA7OpepYsHSmocbIHJQA00Xz0s4Qqmg4jX93GArO4KVC7zs/QS12w3mXfmMlYV8w7DwEg==
   dependencies:
+    "@types/cheerio" "^0.22.10"
     cheerio "^1.0.0-rc.2"
 
 "@vue/test-utils@~1.0.0-beta.29":

From 8a812aaaeea2c7f0be4113c760152da7ed1b8cf0 Mon Sep 17 00:00:00 2001
From: lokalise-bot <support@lokalise.com>
Date: Fri, 29 Nov 2019 11:04:08 +0100
Subject: [PATCH 110/174] Lokalise: update of webapp/locales/pt.json

---
 webapp/locales/pt.json | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/webapp/locales/pt.json b/webapp/locales/pt.json
index ecad7851b..c8a2952b4 100644
--- a/webapp/locales/pt.json
+++ b/webapp/locales/pt.json
@@ -11,7 +11,7 @@
         "no-account": "Ainda não tem uma conta?",
         "register": "Cadastrar-se",
         "moreInfoURL": "https:\/\/human-connection.org\/en\/",
-        "moreInfoHint": "",
+        "moreInfoHint": "para a página de apresentação",
         "success": "Você está conectado!",
         "failure": "Endereço de e-mail ou senha incorretos."
     },
@@ -125,15 +125,15 @@
             "name": "Fornecedores de terceiros",
             "info-description": "Se você concordar, as publicações da seguinte lista de provedores incluirão automaticamente código de terceiros de outros provedores (terceiros) na forma de vídeos, imagens ou texto incorporados.",
             "status": {
-                "description": "",
+                "description": "Como padrão para você, o código incorporado de provedores de terceiros é",
                 "disabled": {
-                    "off": "",
-                    "on": ""
+                    "off": "não exibido inicialmente",
+                    "on": "exibido imediatamente"
                 },
                 "change": {
-                    "question": "",
-                    "allow": "",
-                    "deny": ""
+                    "question": "O código-fonte incorporado de terceiros deve sempre ser exibido para você?",
+                    "allow": "Certeza",
+                    "deny": "Não, obrigado"
                 }
             }
         },
@@ -158,13 +158,13 @@
             "columns": {
                 "name": "Nome",
                 "slug": "Slug",
-                "unblock": ""
+                "unblock": "Desbloquear"
             },
             "empty": "Até agora, você não bloqueou ninguém.",
             "how-to": "Você pode bloquear outros usuários em suas páginas de perfil através do menu de conteúdo.",
             "block": "Bloquear usuário",
             "unblock": "Desbloquear usuário",
-            "unblocked": ""
+            "unblocked": "{name} está desbloqueado novamente"
         },
         "privacy": {
             "name": "Privacidade",
@@ -261,10 +261,10 @@
         "menu": {
             "edit": "Editar publicação",
             "delete": "Excluir publicação",
-            "pin": "",
-            "pinnedSuccessfully": "",
-            "unpin": "",
-            "unpinnedSuccessfully": ""
+            "pin": "Fixar publicação",
+            "pinnedSuccessfully": "Publicação fixada com sucesso!",
+            "unpin": "Desafixar publicação",
+            "unpinnedSuccessfully": "Publicação desafixada com sucesso!"
         },
         "comment": {
             "submit": "Commentar",
@@ -299,7 +299,7 @@
         "validations": {
             "email": "deve ser um endereço de e-mail válido",
             "url": "deve ser uma URL válida",
-            "categories": ""
+            "categories": "devem ser seleccionadas, no mínimo uma e, no máximo três categorias"
         }
     },
     "actions": {
@@ -430,7 +430,7 @@
         "teaserImage": {
             "cropperConfirm": "Confirmar"
         },
-        "languageSelectText": ""
+        "languageSelectText": "Selecionar Idioma"
     },
     "comment": {
         "edit": "Editar Comentário",
@@ -745,8 +745,8 @@
         }
     },
     "donations": {
-        "donations-for": "",
-        "donate-now": "",
-        "amount-of-total": ""
+        "donations-for": "Doações para",
+        "donate-now": "Doe agora",
+        "amount-of-total": "{amount} dos {total} € foram coletados"
     }
 }
\ No newline at end of file

From 3c0a24825c9fa2796192b001b2dfde0ae5864b31 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Fri, 29 Nov 2019 13:26:41 +0100
Subject: [PATCH 111/174] Move components to _new structure/refactor

- extract more components
---
 .../features/ReportList/ReportList.vue        |  45 ++++++-
 .../generic/FiledTable/FiledTable.vue         |  20 ++-
 .../generic}/ReportsTable/ReportsTable.vue    | 126 ++++++++----------
 3 files changed, 105 insertions(+), 86 deletions(-)
 rename webapp/components/{ => _new}/features/ReportList/ReportList.vue (62%)
 rename webapp/components/{ => _new}/generic/FiledTable/FiledTable.vue (69%)
 rename webapp/components/{features => _new/generic}/ReportsTable/ReportsTable.vue (57%)

diff --git a/webapp/components/features/ReportList/ReportList.vue b/webapp/components/_new/features/ReportList/ReportList.vue
similarity index 62%
rename from webapp/components/features/ReportList/ReportList.vue
rename to webapp/components/_new/features/ReportList/ReportList.vue
index bf971c9bd..db03e9ca6 100644
--- a/webapp/components/features/ReportList/ReportList.vue
+++ b/webapp/components/_new/features/ReportList/ReportList.vue
@@ -1,23 +1,60 @@
 <template>
-  <reports-table v-if="reports && reports.length" :reports="reports" @confirm="confirm" />
+  <ds-card space="small" v-if="reports && reports.length">
+    <ds-flex class="notifications-page-flex">
+      <ds-flex-item :width="{ lg: '85%' }">
+        <ds-heading tag="h3">{{ $t('moderation.reports.name') }}</ds-heading>
+      </ds-flex-item>
+      <ds-flex-item width="110px">
+        <client-only>
+          <dropdown-filter @filter="filter" :filterOptions="filterOptions" :selected="selected" />
+        </client-only>
+      </ds-flex-item>
+    </ds-flex>
+    <ds-space />
+    <reports-table :reports="reports" @confirm="confirm" />
+  </ds-card>
   <hc-empty v-else icon="alert" :message="$t('moderation.reports.empty')" />
 </template>
 <script>
-import ReportsTable from '~/components/features/ReportsTable/ReportsTable'
+import DropdownFilter from '~/components/DropdownFilter/DropdownFilter'
+import ReportsTable from '~/components/_new/generic/ReportsTable/ReportsTable'
 import HcEmpty from '~/components/Empty/Empty'
 import { reportsListQuery, reviewMutation } from '~/graphql/Moderation.js'
 
 export default {
   components: {
+    DropdownFilter,
     ReportsTable,
     HcEmpty,
   },
   data() {
     return {
       reports: [],
+      allReports: [],
+      unreviewedReports: [],
+      reviewedReports: [],
+      closedReports: [],
+      selected: this.$t('moderation.reports.filterLabel.all'),
     }
   },
+  computed: {
+    filterOptions() {
+      return [
+        { label: this.$t('moderation.reports.filterLabel.all'), value: this.allReports },
+        {
+          label: this.$t('moderation.reports.filterLabel.unreviewed'),
+          value: this.unreviewedReports,
+        },
+        { label: this.$t('moderation.reports.filterLabel.reviewed'), value: this.reviewedReports },
+        { label: this.$t('moderation.reports.filterLabel.closed'), value: this.closedReports },
+      ]
+    },
+  },
   methods: {
+    filter(option) {
+      this.reports = option.value
+      this.selected = option.label
+    },
     confirm(report) {
       this.openModal(report)
     },
@@ -86,6 +123,10 @@ export default {
       query: reportsListQuery(),
       update({ reports }) {
         this.reports = reports
+        this.allReports = reports
+        this.unreviewedReports = reports.filter(report => !report.reviewed)
+        this.reviewedReports = reports.filter(report => report.reviewed)
+        this.closedReports = reports.filter(report => report.closed)
       },
       fetchPolicy: 'cache-and-network',
     },
diff --git a/webapp/components/generic/FiledTable/FiledTable.vue b/webapp/components/_new/generic/FiledTable/FiledTable.vue
similarity index 69%
rename from webapp/components/generic/FiledTable/FiledTable.vue
rename to webapp/components/_new/generic/FiledTable/FiledTable.vue
index cc33ae505..3cea1beab 100644
--- a/webapp/components/generic/FiledTable/FiledTable.vue
+++ b/webapp/components/_new/generic/FiledTable/FiledTable.vue
@@ -1,16 +1,14 @@
 <template>
-  <ds-table :data="filed" :fields="reportFields" condensed>
+  <ds-table v-if="filed && filed.length" :data="filed" :fields="reportFields" condensed>
     <template #submitter="scope">
-      <ds-space margin-bottom="x-large">
-        <client-only>
-          <hc-user
-            :user="scope.row.submitter"
-            :showAvatar="false"
-            :trunc="30"
-            :date-time="scope.row.createdAt"
-            :positionDatetime="'below'"
-          />
-        </client-only>
+      <ds-space margin-bottom="base">
+        <hc-user
+          :user="scope.row.submitter"
+          :showAvatar="false"
+          :trunc="30"
+          :date-time="scope.row.createdAt"
+          :position-date-time="'below'"
+        />
       </ds-space>
     </template>
     <template #reasonCategory="scope">
diff --git a/webapp/components/features/ReportsTable/ReportsTable.vue b/webapp/components/_new/generic/ReportsTable/ReportsTable.vue
similarity index 57%
rename from webapp/components/features/ReportsTable/ReportsTable.vue
rename to webapp/components/_new/generic/ReportsTable/ReportsTable.vue
index 5b62f024c..d8c5590f6 100644
--- a/webapp/components/features/ReportsTable/ReportsTable.vue
+++ b/webapp/components/_new/generic/ReportsTable/ReportsTable.vue
@@ -29,56 +29,44 @@
       <tbody :key="'tbody-' + report.resource.id">
         <tr valign="top">
           <td class="ds-table-col ds-table-head-col ds-table-head-col-border">
-            <!-- Icon -->
             <ds-text color="soft">
-              <ds-icon
-                v-if="report.resource.__typename === 'Post'"
+              <base-icon
+                v-if="isPost(report.resource)"
                 v-tooltip="{ report: $t('report.contribution.type'), placement: 'right' }"
                 name="bookmark"
               />
-              <ds-icon
-                v-else-if="report.resource.__typename === 'Comment'"
+              <base-icon
+                v-else-if="isComment(report.resource)"
                 v-tooltip="{ report: $t('report.comment.type'), placement: 'right' }"
                 name="comments"
               />
-              <ds-icon
-                v-else-if="report.resource.__typename === 'User'"
+              <base-icon
+                v-else-if="isUser(report.resource)"
                 v-tooltip="{ report: $t('report.user.type'), placement: 'right' }"
                 name="user"
               />
-              <ds-icon v-if="report.resource.disabled" name="eye-slash" class="ban" />
-              <ds-icon v-else name="eye" class="no-ban" />
+              <base-icon v-if="report.resource.disabled" name="eye-slash" class="ban" />
+              <base-icon v-else name="eye" class="no-ban" />
             </ds-text>
+            <ds-space margin-top="xx-large" margin-bottom="x-small">
+              <counter-icon icon="flag" :count="report.filed.length">
+                <a @click="showFiledReports = !showFiledReports">
+                  {{ $t('moderation.reports.moreDetails') }}
+                </a>
+              </counter-icon>
+            </ds-space>
           </td>
           <td class="ds-table-col ds-table-head-col-border">
-            <!-- reported user or other resource -->
-            <div
-              v-if="
-                report.resource.__typename === 'Post' || report.resource.__typename === 'Comment'
-              "
-            >
+            <div v-if="isPost(report.resource) || isComment(report.resource)">
               <nuxt-link
                 :to="{
                   name: 'post-id-slug',
-                  params: {
-                    id: report.resource.id,
-                    slug:
-                      report.resource.__typename === 'Post'
-                        ? report.resource.slug
-                        : report.resource.post.slug,
-                  },
-                  hash:
-                    report.resource.__typename === 'Comment'
-                      ? `#commentId-${report.resource.id}`
-                      : undefined,
+                  params: params(report.resource),
+                  hash: hashParam(report.resource),
                 }"
+                @click.native="markNotificationAsRead(report.resource.id)"
               >
-                <b v-if="report.resource.__typename === 'Post'">
-                  {{ report.resource.title | truncate(100) }}
-                </b>
-                <b v-else>
-                  {{ report.resource.contentExcerpt | removeHtml | truncate(100) }}
-                </b>
+                <b>{{ report.resource.title || report.resource.contentExcerpt | truncate(50) }}</b>
               </nuxt-link>
             </div>
             <div v-else>
@@ -86,35 +74,7 @@
                 <hc-user :user="report.resource" :showAvatar="false" :trunc="30" />
               </client-only>
             </div>
-            <!-- <div v-if="report.reviewed">
-              <ds-space margin="x-large"/>
-              <ds-flex gutter="small">
-                <ds-flex-item width="25%">
-                  <b>{{ $t('moderation.reports.previousDecision') }}</b>
-                </ds-flex-item>
-                <ds-flex-item>
-                  <div>
-                    <span v-if="report.resource.disabled">
-                      <ds-icon name="eye-slash" class="ban" />
-                      {{ $t('moderation.reports.disabledAt') }}
-                    </span>
-                    <span v-else>
-                      <ds-icon name="eye" class="no-ban" />
-                      {{ $t('moderation.reports.enabledAt') }}
-                    </span>
-                    <ds-text size="small" color="soft">
-                      <ds-icon name="clock" />
-                      <client-only>
-                        <hc-relative-date-time :date-time="report.updatedAt" />
-                      </client-only>
-                    </ds-text>
-                  </div>
-                </ds-flex-item>
-              </ds-flex>
-              <ds-space margin-bottom="x-small" />
-            </div> -->
           </td>
-          <!-- contentBelongsToUser -->
           <td class="ds-table-col ds-table-head-col-border">
             <client-only>
               <hc-user
@@ -127,7 +87,6 @@
             </client-only>
           </td>
           <td class="ds-table-col ds-table-head-col-border">
-            <!-- latestClaim.closed -->
             <b v-if="report.closed">
               {{ $t('moderation.reports.decided') }}
             </b>
@@ -140,15 +99,14 @@
             >
               {{ $t('moderation.reports.decideButton') }}
             </ds-button>
-            <!-- reviewed -->
             <div v-if="report.reviewed">
               <br />
               <div v-if="report.resource.disabled">
-                <ds-icon name="eye-slash" class="ban" />
+                <base-icon name="eye-slash" class="ban" />
                 {{ $t('moderation.reports.disabledBy') }}
               </div>
               <div v-else>
-                <ds-icon name="eye" class="no-ban" />
+                <base-icon name="eye" class="no-ban" />
                 {{ $t('moderation.reports.enabledBy') }}
               </div>
               <client-only>
@@ -164,11 +122,11 @@
             <div v-else>
               <br />
               <div v-if="report.resource.disabled">
-                <ds-icon name="eye-slash" class="ban" />
+                <base-icon name="eye-slash" class="ban" />
                 {{ $t('moderation.reports.disabled') }}
               </div>
               <div v-else>
-                <ds-icon name="eye" class="no-ban" />
+                <base-icon name="eye" class="no-ban" />
                 {{ $t('moderation.reports.enabled') }}
               </div>
             </div>
@@ -177,10 +135,8 @@
         <tr>
           <td class="ds-table-col ds-table-head-col-border"></td>
           <td class="ds-table-col ds-table-head-col-border" colspan="3">
-            <div>
-              <ds-space margin-bottom="base" />
-              <filed-table :filed="report.filed" />
-            </div>
+            <ds-space margin-bottom="base" />
+            <filed-table :filed="report.filed" v-if="showFiledReports" />
           </td>
         </tr>
       </tbody>
@@ -188,16 +144,21 @@
   </table>
 </template>
 <script>
-// import HcRelativeDateTime from '~/components/RelativeDateTime'
+import CounterIcon from '~/components/_new/generic/CounterIcon/CounterIcon'
 import HcUser from '~/components/User/User'
-import FiledTable from '~/components/generic/FiledTable/FiledTable'
+import FiledTable from '~/components/_new/generic/FiledTable/FiledTable'
 
 export default {
   components: {
-    // HcRelativeDateTime,
+    CounterIcon,
     HcUser,
     FiledTable,
   },
+  data() {
+    return {
+      showFiledReports: false,
+    }
+  },
   props: {
     reports: { type: Array, default: () => [] },
   },
@@ -205,6 +166,25 @@ export default {
     confirm(report) {
       this.$emit('confirm', report)
     },
+    isComment(resource) {
+      return resource.__typename === 'Comment'
+    },
+    isPost(resource) {
+      return resource.__typename === 'Post'
+    },
+    isUser(resource) {
+      return resource.__typename === 'User'
+    },
+    params(resource) {
+      const post = this.isComment(resource) ? resource.post : resource
+      return {
+        id: post.id,
+        slug: post.slug,
+      }
+    },
+    hashParam(resource) {
+      return this.isComment(resource) ? `#commentId-${resource.id}` : ''
+    },
   },
 }
 </script>

From a8a9abb4e46d058b2fc5a7ff6d5d371d35290fef Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Fri, 29 Nov 2019 13:59:53 +0100
Subject: [PATCH 112/174] Refactor/Add new components

---
 webapp/components/CommentList/CommentList.vue | 24 ++++-----------
 .../DropdownFilter/DropdownFilter.vue         |  6 ++--
 webapp/components/User/User.vue               |  2 +-
 .../_new/generic/CounterIcon/CounterIcon.vue  | 29 +++++++++++++++++++
 webapp/locales/en.json                        |  7 +++++
 webapp/pages/moderation/index.vue             |  7 ++---
 webapp/pages/notifications/index.vue          |  4 +--
 7 files changed, 49 insertions(+), 30 deletions(-)
 create mode 100644 webapp/components/_new/generic/CounterIcon/CounterIcon.vue

diff --git a/webapp/components/CommentList/CommentList.vue b/webapp/components/CommentList/CommentList.vue
index 888c167e9..25ed62f68 100644
--- a/webapp/components/CommentList/CommentList.vue
+++ b/webapp/components/CommentList/CommentList.vue
@@ -1,19 +1,9 @@
 <template>
   <div id="comments">
     <h3 style="margin-top: -10px;">
-      <span>
-        <base-icon name="comments" />
-        <ds-tag
-          v-if="post.comments.length"
-          style="margin-top: -4px; margin-left: -12px; position: absolute;"
-          color="primary"
-          size="small"
-          round
-        >
-          {{ post.comments.length }}
-        </ds-tag>
-        <span class="list-title">{{ $t('common.comment', null, 0) }}</span>
-      </span>
+      <counter-icon icon="comments" :count="post.comments.length">
+        {{ $t('common.comment', null, 0) }}
+      </counter-icon>
     </h3>
     <ds-space margin-bottom="large" />
     <div v-if="post.comments && post.comments.length" id="comments" class="comments">
@@ -31,12 +21,14 @@
   </div>
 </template>
 <script>
+import CounterIcon from '~/components/_new/generic/CounterIcon/CounterIcon'
 import Comment from '~/components/Comment/Comment'
 import scrollToAnchor from '~/mixins/scrollToAnchor'
 
 export default {
   mixins: [scrollToAnchor],
   components: {
+    CounterIcon,
     Comment,
   },
   props: {
@@ -58,9 +50,3 @@ export default {
   },
 }
 </script>
-
-<style lang="scss" scoped>
-.list-title {
-  margin-left: $space-x-small;
-}
-</style>
diff --git a/webapp/components/DropdownFilter/DropdownFilter.vue b/webapp/components/DropdownFilter/DropdownFilter.vue
index 2a3637f41..bfa78e709 100644
--- a/webapp/components/DropdownFilter/DropdownFilter.vue
+++ b/webapp/components/DropdownFilter/DropdownFilter.vue
@@ -25,7 +25,7 @@
         class="dropdown-menu-item"
         :route="item.route"
         :parents="item.parents"
-        @click.stop.prevent="filterNotifications(item.route, toggleMenu)"
+        @click.stop.prevent="filter(item.route, toggleMenu)"
       >
         {{ item.route.label }}
       </ds-menu-item>
@@ -44,8 +44,8 @@ export default {
     filterOptions: { type: Array, default: () => [] },
   },
   methods: {
-    filterNotifications(option, toggleMenu) {
-      this.$emit('filterNotifications', option)
+    filter(option, toggleMenu) {
+      this.$emit('filter', option)
       toggleMenu()
     },
   },
diff --git a/webapp/components/User/User.vue b/webapp/components/User/User.vue
index d7a9274ed..4158027b3 100644
--- a/webapp/components/User/User.vue
+++ b/webapp/components/User/User.vue
@@ -27,7 +27,7 @@
           </ds-text>
           <!-- dateTime: kind of same as above: make own component? -->
           <ds-text v-if="positionDatetime === 'below' && dateTime" size="small" color="soft">
-            <ds-icon name="clock" />
+            <base-icon name="clock" />
             <client-only>
               <hc-relative-date-time :date-time="dateTime" />
             </client-only>
diff --git a/webapp/components/_new/generic/CounterIcon/CounterIcon.vue b/webapp/components/_new/generic/CounterIcon/CounterIcon.vue
new file mode 100644
index 000000000..23dcc0795
--- /dev/null
+++ b/webapp/components/_new/generic/CounterIcon/CounterIcon.vue
@@ -0,0 +1,29 @@
+<template>
+  <span>
+    <base-icon :name="icon" />
+    <ds-tag
+      style="margin-top: -4px; margin-left: -12px; position: absolute;"
+      color="primary"
+      size="small"
+      round
+    >
+      {{ count }}
+    </ds-tag>
+    <span class="counter-icon-text">
+      <slot />
+    </span>
+  </span>
+</template>
+<script>
+export default {
+  props: {
+    icon: { type: String, required: true },
+    count: { type: Number, required: true },
+  },
+}
+</script>
+<style lang="scss" scoped>
+.counter-icon-text {
+  margin-left: $space-xx-small;
+}
+</style>
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 41d7b7f30..aa180b64e 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -500,6 +500,13 @@
       "reasonCategory": "Category",
       "reasonDescription": "Description",
       "submitter": "Reported by",
+      "filterLabel": {
+        "all": "All",
+        "unreviewed": "Unreviewed",
+        "reviewed": "Reviewed",
+        "closed": "Closed"
+      },
+      "moreDetails": "Report Details",
       "decideModal": {
         "submit": "Confirm decision",
         "cancel": "Cancel",
diff --git a/webapp/pages/moderation/index.vue b/webapp/pages/moderation/index.vue
index bb08a15a1..35abcaff7 100644
--- a/webapp/pages/moderation/index.vue
+++ b/webapp/pages/moderation/index.vue
@@ -1,12 +1,9 @@
 <template>
-  <ds-card space="small">
-    <ds-heading tag="h3">{{ $t('moderation.reports.name') }}</ds-heading>
-    <report-list />
-  </ds-card>
+  <report-list />
 </template>
 
 <script>
-import ReportList from '~/components/features/ReportList/ReportList'
+import ReportList from '~/components/_new/features/ReportList/ReportList'
 
 export default {
   components: {
diff --git a/webapp/pages/notifications/index.vue b/webapp/pages/notifications/index.vue
index f18d5afd2..1995f3b4d 100644
--- a/webapp/pages/notifications/index.vue
+++ b/webapp/pages/notifications/index.vue
@@ -7,7 +7,7 @@
       <ds-flex-item width="110px">
         <client-only>
           <dropdown-filter
-            @filterNotifications="filterNotifications"
+            @filter="filter"
             :filterOptions="filterOptions"
             :selected="selected"
           />
@@ -60,7 +60,7 @@ export default {
     },
   },
   methods: {
-    filterNotifications(option) {
+    filter(option) {
       this.notificationRead = option.value
       this.selected = option.label
       this.$apollo.queries.notifications.refresh()

From 107f10edc99c555026edc040efb0b9462487b7fd Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Fri, 29 Nov 2019 15:29:11 +0100
Subject: [PATCH 113/174] Update table styling

---
 .../_new/generic/FiledTable/FiledTable.vue    | 58 ++++++++++++-------
 .../generic/ReportsTable/ReportsTable.vue     |  8 ++-
 webapp/locales/en.json                        |  1 +
 webapp/pages/notifications/index.vue          |  6 +-
 4 files changed, 44 insertions(+), 29 deletions(-)

diff --git a/webapp/components/_new/generic/FiledTable/FiledTable.vue b/webapp/components/_new/generic/FiledTable/FiledTable.vue
index 3cea1beab..246e8c754 100644
--- a/webapp/components/_new/generic/FiledTable/FiledTable.vue
+++ b/webapp/components/_new/generic/FiledTable/FiledTable.vue
@@ -1,30 +1,31 @@
 <template>
-  <ds-table v-if="filed && filed.length" :data="filed" :fields="reportFields" condensed>
-    <template #submitter="scope">
-      <ds-space margin-bottom="base">
-        <hc-user
-          :user="scope.row.submitter"
-          :showAvatar="false"
-          :trunc="30"
-          :date-time="scope.row.createdAt"
-          :position-date-time="'below'"
-        />
-      </ds-space>
-    </template>
-    <template #reasonCategory="scope">
-      {{ $t('report.reason.category.options.' + scope.row.reasonCategory) }}
-    </template>
-    <template #reasonDescription="scope">
-      {{ scope.row.reasonDescription.length ? scope.row.reasonDescription : '—' }}
-    </template>
-  </ds-table>
+  <ds-space margin-bottom="base">
+    <ds-table v-if="filed && filed.length" :data="filed" :fields="reportFields" condensed>
+      <template #submitter="scope">
+        <hc-user :user="scope.row.submitter" :showAvatar="false" :trunc="30" />
+      </template>
+      <template #reportedOn="scope">
+        <ds-text size="small">
+          <hc-relative-date-time :date-time="scope.row.createdAt" />
+        </ds-text>
+      </template>
+      <template #reasonCategory="scope">
+        {{ $t('report.reason.category.options.' + scope.row.reasonCategory) }}
+      </template>
+      <template #reasonDescription="scope">
+        {{ scope.row.reasonDescription.length ? scope.row.reasonDescription : '—' }}
+      </template>
+    </ds-table>
+  </ds-space>
 </template>
 <script>
 import HcUser from '~/components/User/User'
+import HcRelativeDateTime from '~/components/RelativeDateTime'
 
 export default {
   components: {
     HcUser,
+    HcRelativeDateTime,
   },
   props: {
     filed: { type: Array, default: () => [] },
@@ -32,9 +33,22 @@ export default {
   computed: {
     reportFields() {
       return {
-        submitter: this.$t('moderation.reports.submitter'),
-        reasonCategory: this.$t('moderation.reports.reasonCategory'),
-        reasonDescription: this.$t('moderation.reports.reasonDescription'),
+        submitter: {
+          label: this.$t('moderation.reports.submitter'),
+          width: '15%',
+        },
+        reportedOn: {
+          label: this.$t('moderation.reports.reportedOn'),
+          width: '20%',
+        },
+        reasonCategory: {
+          label: this.$t('moderation.reports.reasonCategory'),
+          width: '30%',
+        },
+        reasonDescription: {
+          label: this.$t('moderation.reports.reasonDescription'),
+          width: '35%',
+        },
       }
     },
   },
diff --git a/webapp/components/_new/generic/ReportsTable/ReportsTable.vue b/webapp/components/_new/generic/ReportsTable/ReportsTable.vue
index d8c5590f6..337e6097d 100644
--- a/webapp/components/_new/generic/ReportsTable/ReportsTable.vue
+++ b/webapp/components/_new/generic/ReportsTable/ReportsTable.vue
@@ -133,8 +133,7 @@
           </td>
         </tr>
         <tr>
-          <td class="ds-table-col ds-table-head-col-border"></td>
-          <td class="ds-table-col ds-table-head-col-border" colspan="3">
+          <td class="ds-table-col ds-table-head-col-border filed-table" colspan="4">
             <ds-space margin-bottom="base" />
             <filed-table :filed="report.filed" v-if="showFiledReports" />
           </td>
@@ -188,3 +187,8 @@ export default {
   },
 }
 </script>
+<style lang="scss">
+.filed-table {
+  padding-left: $space-xx-large;
+}
+</style>
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index aa180b64e..3e23e461d 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -506,6 +506,7 @@
         "reviewed": "Reviewed",
         "closed": "Closed"
       },
+      "reportedOn": "Date",
       "moreDetails": "Report Details",
       "decideModal": {
         "submit": "Confirm decision",
diff --git a/webapp/pages/notifications/index.vue b/webapp/pages/notifications/index.vue
index 1995f3b4d..aa002cec7 100644
--- a/webapp/pages/notifications/index.vue
+++ b/webapp/pages/notifications/index.vue
@@ -6,11 +6,7 @@
       </ds-flex-item>
       <ds-flex-item width="110px">
         <client-only>
-          <dropdown-filter
-            @filter="filter"
-            :filterOptions="filterOptions"
-            :selected="selected"
-          />
+          <dropdown-filter @filter="filter" :filterOptions="filterOptions" :selected="selected" />
         </client-only>
       </ds-flex-item>
     </ds-flex>

From 10012fa62a70ddcf3c632c4ead9f35cdefddf88a Mon Sep 17 00:00:00 2001
From: ogerly <landmatrosen@googlemail.com>
Date: Fri, 29 Nov 2019 16:24:55 +0100
Subject: [PATCH 114/174] No public registration in development so that backend
 test pass

---
 docker-compose.override.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index df7d6ac92..56f13939e 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -15,7 +15,7 @@ services:
       - ./webapp:/nitro-web
     environment:
       - NUXT_BUILD=/tmp/nuxt # avoid file permission issues when `rm -rf .nuxt/`
-      - PUBLIC_REGISTRATION=true
+      - PUBLIC_REGISTRATION=false
     command: yarn run dev
   backend:
     build:
@@ -29,7 +29,7 @@ services:
       - SMTP_PORT=25
       - SMTP_IGNORE_TLS=true
       - "DEBUG=${DEBUG}"
-      - PUBLIC_REGISTRATION=true
+      - PUBLIC_REGISTRATION=false
   maintenance:
     image: humanconnection/maintenance:latest
     build:

From c0d9fe5257615ec95960744d898736866f46d676 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Fri, 29 Nov 2019 18:43:24 +0100
Subject: [PATCH 115/174] Test validationMiddleware validateReport/Review

---
 .../validation/validationMiddleware.spec.js   | 158 ++++++++++++++++++
 1 file changed, 158 insertions(+)
 create mode 100644 backend/src/middleware/validation/validationMiddleware.spec.js

diff --git a/backend/src/middleware/validation/validationMiddleware.spec.js b/backend/src/middleware/validation/validationMiddleware.spec.js
new file mode 100644
index 000000000..b0c1dbd5a
--- /dev/null
+++ b/backend/src/middleware/validation/validationMiddleware.spec.js
@@ -0,0 +1,158 @@
+import { gql } from '../../helpers/jest'
+import Factory from '../../seed/factories'
+import { neode as getNeode, getDriver } from '../../bootstrap/neo4j'
+import { createTestClient } from 'apollo-server-testing'
+import createServer from '../../server'
+
+const factory = Factory()
+const neode = getNeode()
+const driver = getDriver()
+let authenticatedUser,
+  mutate,
+  users,
+  offensivePost,
+  reportVariables,
+  disableVariables,
+  reportingUser,
+  moderatingUser
+
+const reportMutation = gql`
+  mutation($resourceId: ID!, $reasonCategory: ReasonCategory!, $reasonDescription: String!) {
+    fileReport(
+      resourceId: $resourceId
+      reasonCategory: $reasonCategory
+      reasonDescription: $reasonDescription
+    ) {
+      id
+    }
+  }
+`
+const reviewMutation = gql`
+  mutation($resourceId: ID!, $disable: Boolean, $closed: Boolean) {
+    review(resourceId: $resourceId, disable: $disable, closed: $closed) {
+      createdAt
+      updatedAt
+    }
+  }
+`
+beforeAll(() => {
+  const { server } = createServer({
+    context: () => {
+      return {
+        user: authenticatedUser,
+        neode,
+        driver,
+      }
+    },
+  })
+  mutate = createTestClient(server).mutate
+})
+
+// const { query } = createTestClient(server)
+
+beforeEach(async () => {
+  users = await Promise.all([
+    factory.create('User', {
+      id: 'reporting-user',
+    }),
+    factory.create('User', {
+      id: 'moderating-user',
+      role: 'moderator',
+    }),
+  ])
+  reportVariables = {
+    resourceId: 'whatever',
+    reasonCategory: 'other',
+    reasonDescription: 'Violates code of conduct !!!',
+  }
+  disableVariables = {
+    resourceId: 'undefined-resource',
+    disable: true,
+    closed: false,
+  }
+  reportingUser = users[0]
+  moderatingUser = users[1]
+  offensivePost = await factory.create('Post', {
+    id: 'offensive-post',
+    authorId: 'moderating-user',
+  })
+})
+
+afterEach(async () => {
+  await factory.cleanDatabase()
+})
+
+describe('validateReport', () => {
+  it('throws an error if a user tries to report themself', async () => {
+    authenticatedUser = await reportingUser.toJson()
+    reportVariables = { ...reportVariables, resourceId: 'reporting-user' }
+    await expect(
+      mutate({ mutation: reportMutation, variables: reportVariables }),
+    ).resolves.toMatchObject({
+      data: { fileReport: null },
+      errors: [{ message: 'You cannot report yourself!' }],
+    })
+  })
+})
+
+describe('validateReview', () => {
+  beforeEach(async () => {
+    const reportAgainstModerator = await factory.create('Report')
+    await Promise.all([
+      reportAgainstModerator.relateTo(reportingUser, 'filed', {
+        ...reportVariables,
+        resourceId: 'moderating-user',
+      }),
+      reportAgainstModerator.relateTo(moderatingUser, 'belongsTo'),
+    ])
+    authenticatedUser = await moderatingUser.toJson()
+  })
+
+  it('throws an error if a user tries to review a report against them', async () => {
+    disableVariables = { ...disableVariables, resourceId: 'moderating-user' }
+    await expect(
+      mutate({ mutation: reviewMutation, variables: disableVariables }),
+    ).resolves.toMatchObject({
+      data: { review: null },
+      errors: [{ message: 'You cannot review yourself!' }],
+    })
+  })
+
+  it('throws an error for invaild resource', async () => {
+    disableVariables = { ...disableVariables, resourceId: 'non-existent-resource' }
+    await expect(
+      mutate({ mutation: reviewMutation, variables: disableVariables }),
+    ).resolves.toMatchObject({
+      data: { review: null },
+      errors: [{ message: 'Resource not found!' }],
+    })
+  })
+
+  it('throws an error if no report exists', async () => {
+    disableVariables = { ...disableVariables, resourceId: 'offensive-post' }
+    await expect(
+      mutate({ mutation: reviewMutation, variables: disableVariables }),
+    ).resolves.toMatchObject({
+      data: { review: null },
+      errors: [{ message: 'Before starting the review process, please report the Post!' }],
+    })
+  })
+
+  it('throws an error if a moderator tries to review their own resource(Post|Comment)', async () => {
+    const reportAgainstOffensivePost = await factory.create('Report')
+    await Promise.all([
+      reportAgainstOffensivePost.relateTo(reportingUser, 'filed', {
+        ...reportVariables,
+        resourceId: 'offensive-post',
+      }),
+      reportAgainstOffensivePost.relateTo(offensivePost, 'belongsTo'),
+    ])
+    disableVariables = { ...disableVariables, resourceId: 'offensive-post' }
+    await expect(
+      mutate({ mutation: reviewMutation, variables: disableVariables }),
+    ).resolves.toMatchObject({
+      data: { review: null },
+      errors: [{ message: 'You cannot review your own Post!' }],
+    })
+  })
+})

From 5d63dda6ee8f1a57fe01b63201332d1026e5524b Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Fri, 29 Nov 2019 18:43:50 +0100
Subject: [PATCH 116/174] Refactor validateReport/Review

- Don't throw error if a report already exists since we use MERGE and
that does not create a new resource if it exists. That is tested at the
neo4j(database) level.
- We also have a test to make in reports.spec.js that no duplicate is
created to ensure we didn't make some error on our part.
- Fix some faulty logic in validateReview
---
 .../validation/validationMiddleware.js        | 30 ++++---------------
 .../validation/validationMiddleware.spec.js   |  2 --
 2 files changed, 5 insertions(+), 27 deletions(-)

diff --git a/backend/src/middleware/validation/validationMiddleware.js b/backend/src/middleware/validation/validationMiddleware.js
index ec761f49a..bbde03df6 100644
--- a/backend/src/middleware/validation/validationMiddleware.js
+++ b/backend/src/middleware/validation/validationMiddleware.js
@@ -59,35 +59,15 @@ const validateUpdatePost = async (resolve, root, args, context, info) => {
 
 const validateReport = async (resolve, root, args, context, info) => {
   const { resourceId } = args
-  const { user, driver } = context
+  const { user } = context
   if (resourceId === user.id) throw new Error('You cannot report yourself!')
-  const session = driver.session()
-  const reportQueryRes = await session.run(
-    `
-      MATCH (:User {id: $submitterId})-[:FILED]->(:Report {closed: false})-[:BELONGS_TO]->(resource {id: $resourceId}) 
-      WHERE resource:User OR resource:Post OR resource:Comment
-      RETURN labels(resource)[0] AS label
-    `,
-    {
-      resourceId,
-      submitterId: user.id,
-    },
-  )
-  session.close()
-  const [existingReportedResource] = reportQueryRes.records.map(record => {
-    return {
-      label: record.get('label'),
-    }
-  })
-
-  if (existingReportedResource) throw new Error(`${existingReportedResource.label}`)
   return resolve(root, args, context, info)
 }
 
 const validateReview = async (resolve, root, args, context, info) => {
   const { resourceId } = args
   const { user, driver } = context
-  if (resourceId === user.id) throw new Error('You can not review yourself!')
+  if (resourceId === user.id) throw new Error('You cannot review yourself!')
   const session = driver.session()
   const reportQueryRes = await session.run(
     `
@@ -106,7 +86,7 @@ const validateReview = async (resolve, root, args, context, info) => {
   const [existingReportedResource] = reportQueryRes.records.map(record => {
     return {
       label: record.get('label'),
-      author: record.get('author'),
+      author: record.get('author').properties,
       filed: record.get('filed'),
     }
   })
@@ -114,13 +94,13 @@ const validateReview = async (resolve, root, args, context, info) => {
   if (!existingReportedResource) throw new Error(`Resource not found!`)
   if (!existingReportedResource.filed)
     throw new Error(
-      `Before you can start the reviewing process, please report the ${existingReportedResource.label}!`,
+      `Before starting the review process, please report the ${existingReportedResource.label}!`,
     )
   const authorId =
     existingReportedResource.label !== 'User' && existingReportedResource.author
       ? existingReportedResource.author.id
       : null
-  if (authorId && resourceId === authorId)
+  if (authorId && authorId === user.id)
     throw new Error(`You cannot review your own ${existingReportedResource.label}!`)
   return resolve(root, args, context, info)
 }
diff --git a/backend/src/middleware/validation/validationMiddleware.spec.js b/backend/src/middleware/validation/validationMiddleware.spec.js
index b0c1dbd5a..9448d50cf 100644
--- a/backend/src/middleware/validation/validationMiddleware.spec.js
+++ b/backend/src/middleware/validation/validationMiddleware.spec.js
@@ -48,8 +48,6 @@ beforeAll(() => {
   mutate = createTestClient(server).mutate
 })
 
-// const { query } = createTestClient(server)
-
 beforeEach(async () => {
   users = await Promise.all([
     factory.create('User', {

From f5545e3976b9028ef41350a00e64bf077a14bf39 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Fri, 29 Nov 2019 19:45:34 +0100
Subject: [PATCH 117/174] Fix middleware/spec

---
 .../notificationsMiddleware.spec.js           |  2 +-
 .../validation/validationMiddleware.js        |  7 ++++---
 .../validation/validationMiddleware.spec.js   | 21 ++++++++++++++++++-
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/backend/src/middleware/notifications/notificationsMiddleware.spec.js b/backend/src/middleware/notifications/notificationsMiddleware.spec.js
index 502ddaa8e..2122d009b 100644
--- a/backend/src/middleware/notifications/notificationsMiddleware.spec.js
+++ b/backend/src/middleware/notifications/notificationsMiddleware.spec.js
@@ -371,7 +371,7 @@ describe('notifications', () => {
                 expect(readAfter).toEqual(false)
               })
 
-              it('updates the `createdAt` attribute', async () => {
+              it('does not update the `createdAt` attribute', async () => {
                 await createPostAction()
                 await markAsReadAction()
                 const {
diff --git a/backend/src/middleware/validation/validationMiddleware.js b/backend/src/middleware/validation/validationMiddleware.js
index bbde03df6..b8c539a0f 100644
--- a/backend/src/middleware/validation/validationMiddleware.js
+++ b/backend/src/middleware/validation/validationMiddleware.js
@@ -86,19 +86,20 @@ const validateReview = async (resolve, root, args, context, info) => {
   const [existingReportedResource] = reportQueryRes.records.map(record => {
     return {
       label: record.get('label'),
-      author: record.get('author').properties,
+      author: record.get('author'),
       filed: record.get('filed'),
     }
   })
 
-  if (!existingReportedResource) throw new Error(`Resource not found!`)
+  if (!existingReportedResource)
+    throw new Error(`Resource not found or is not a Post|Comment|User!`)
   if (!existingReportedResource.filed)
     throw new Error(
       `Before starting the review process, please report the ${existingReportedResource.label}!`,
     )
   const authorId =
     existingReportedResource.label !== 'User' && existingReportedResource.author
-      ? existingReportedResource.author.id
+      ? existingReportedResource.author.properties.id
       : null
   if (authorId && authorId === user.id)
     throw new Error(`You cannot review your own ${existingReportedResource.label}!`)
diff --git a/backend/src/middleware/validation/validationMiddleware.spec.js b/backend/src/middleware/validation/validationMiddleware.spec.js
index 9448d50cf..87fc2a329 100644
--- a/backend/src/middleware/validation/validationMiddleware.spec.js
+++ b/backend/src/middleware/validation/validationMiddleware.spec.js
@@ -122,7 +122,7 @@ describe('validateReview', () => {
       mutate({ mutation: reviewMutation, variables: disableVariables }),
     ).resolves.toMatchObject({
       data: { review: null },
-      errors: [{ message: 'Resource not found!' }],
+      errors: [{ message: 'Resource not found or is not a Post|Comment|User!' }],
     })
   })
 
@@ -153,4 +153,23 @@ describe('validateReview', () => {
       errors: [{ message: 'You cannot review your own Post!' }],
     })
   })
+
+  describe('moderate a resource that is not a (Comment|Post|User) ', () => {
+    beforeEach(async () => {
+      await Promise.all([factory.create('Tag', { id: 'tag-id' })])
+    })
+
+    it('returns null', async () => {
+      disableVariables = {
+        ...disableVariables,
+        resourceId: 'tag-id',
+      }
+      await expect(
+        mutate({ mutation: reviewMutation, variables: disableVariables }),
+      ).resolves.toMatchObject({
+        data: { review: null },
+        errors: [{ message: 'Resource not found or is not a Post|Comment|User!' }],
+      })
+    })
+  })
 })

From bbd80fbc2300cd0d1689c8e7bda69f29123b5a1a Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Fri, 29 Nov 2019 19:45:52 +0100
Subject: [PATCH 118/174] Add test cases for review workflow

---
 backend/src/schema/resolvers/moderation.js    |  5 +-
 .../src/schema/resolvers/moderation.spec.js   | 82 +++++++++++--------
 2 files changed, 49 insertions(+), 38 deletions(-)

diff --git a/backend/src/schema/resolvers/moderation.js b/backend/src/schema/resolvers/moderation.js
index b60325cc4..b5aed1e14 100644
--- a/backend/src/schema/resolvers/moderation.js
+++ b/backend/src/schema/resolvers/moderation.js
@@ -18,12 +18,13 @@ export default {
       const session = driver.session()
       try {
         const cypher = ` 
-            MATCH (resource {id: $params.resourceId})<-[:BELONGS_TO]-(report:Report {closed: false})
             MATCH (moderator:User {id: $moderatorId})
+            MATCH (resource {id: $params.resourceId})<-[:BELONGS_TO]-(report:Report {closed: false})
             WHERE resource:User OR resource:Post OR resource:Comment
-            MERGE (report)<-[review:REVIEWED { disable: $params.disable, closed: $params.closed }]-(moderator)
+            MERGE (report)<-[review:REVIEWED]-(moderator)
             ON CREATE SET review.createdAt = $dateTime, review.updatedAt = review.createdAt
             ON MATCH SET review.updatedAt = $dateTime
+            SET review.disable = $params.disable, review.closed = $params.closed
             SET report.updatedAt = $dateTime, report.closed = review.closed
             SET resource.disabled = review.disable
 
diff --git a/backend/src/schema/resolvers/moderation.spec.js b/backend/src/schema/resolvers/moderation.spec.js
index 397f642af..5e280a6f5 100644
--- a/backend/src/schema/resolvers/moderation.spec.js
+++ b/backend/src/schema/resolvers/moderation.spec.js
@@ -159,6 +159,41 @@ describe('moderate resources', () => {
           errors: undefined,
         })
       })
+
+      it('creates only one review for multiple reviews by the same moderator on same resource', async () => {
+        await Promise.all([
+          mutate({
+            mutation: reviewMutation,
+            variables: { ...disableVariables, resourceId: 'should-i-be-disabled' },
+          }),
+          mutate({
+            mutation: reviewMutation,
+            variables: { ...enableVariables, resourceId: 'should-i-be-disabled' },
+          }),
+        ])
+        const cypher =
+          'MATCH (:Report)<-[review:REVIEWED]-(moderator:User {id: "moderator-id"}) RETURN review'
+        const reviews = await neode.cypher(cypher)
+        expect(reviews.records).toHaveLength(1)
+      })
+
+      it('updates the updatedAt attribute', async () => {
+        const [firstReview, secondReview] = await Promise.all([
+          mutate({
+            mutation: reviewMutation,
+            variables: { ...disableVariables, resourceId: 'should-i-be-disabled' },
+          }),
+          mutate({
+            mutation: reviewMutation,
+            variables: { ...enableVariables, resourceId: 'should-i-be-disabled' },
+          }),
+        ])
+        expect(firstReview.data.review.updatedAt).toBeTruthy()
+        expect(Date.parse(firstReview.data.review.updatedAt)).toEqual(expect.any(Number))
+        expect(secondReview.data.review.updatedAt).toBeTruthy()
+        expect(Date.parse(secondReview.data.review.updatedAt)).toEqual(expect.any(Number))
+        expect(firstReview.data.review.updatedAt).not.toEqual(secondReview.data.review.updatedAt)
+      })
     })
   })
 
@@ -192,24 +227,6 @@ describe('moderate resources', () => {
         authenticatedUser = await moderator.toJson()
       })
 
-      describe('review of a resource that is not a (Comment|Post|User) ', () => {
-        beforeEach(async () => {
-          disableVariables = {
-            ...disableVariables,
-            resourceId: 'tag-id',
-          }
-          await factory.create('Tag', { id: 'tag-id' })
-        })
-
-        it('returns null', async () => {
-          await expect(
-            mutate({ mutation: reviewMutation, variables: disableVariables }),
-          ).resolves.toMatchObject({
-            data: { review: null },
-          })
-        })
-      })
-
       describe('moderate a comment', () => {
         beforeEach(async () => {
           const trollingComment = await factory.create('Comment', {
@@ -254,6 +271,7 @@ describe('moderate resources', () => {
                 },
               },
             },
+            errors: undefined,
           })
         })
 
@@ -264,6 +282,7 @@ describe('moderate resources', () => {
             data: {
               review: { resource: { __typename: 'Comment', id: 'comment-id', disabled: true } },
             },
+            errors: undefined,
           })
         })
 
@@ -281,6 +300,7 @@ describe('moderate resources', () => {
                 report: { id: expect.any(String), closed: true },
               },
             },
+            errors: undefined,
           })
         })
       })
@@ -314,6 +334,7 @@ describe('moderate resources', () => {
                 resource: { __typename: 'Post', id: 'post-id' },
               },
             },
+            errors: undefined,
           })
         })
 
@@ -332,6 +353,7 @@ describe('moderate resources', () => {
                 },
               },
             },
+            errors: undefined,
           })
         })
 
@@ -340,6 +362,7 @@ describe('moderate resources', () => {
             mutate({ mutation: reviewMutation, variables: disableVariables }),
           ).resolves.toMatchObject({
             data: { review: { resource: { __typename: 'Post', id: 'post-id', disabled: true } } },
+            errors: undefined,
           })
         })
 
@@ -357,6 +380,7 @@ describe('moderate resources', () => {
                 report: { id: expect.any(String), closed: true },
               },
             },
+            errors: undefined,
           })
         })
       })
@@ -386,6 +410,7 @@ describe('moderate resources', () => {
             mutate({ mutation: reviewMutation, variables: disableVariables }),
           ).resolves.toMatchObject({
             data: { review: { resource: { __typename: 'User', id: 'user-id' } } },
+            errors: undefined,
           })
         })
 
@@ -404,6 +429,7 @@ describe('moderate resources', () => {
                 },
               },
             },
+            errors: undefined,
           })
         })
 
@@ -412,6 +438,7 @@ describe('moderate resources', () => {
             mutate({ mutation: reviewMutation, variables: disableVariables }),
           ).resolves.toMatchObject({
             data: { review: { resource: { __typename: 'User', id: 'user-id', disabled: true } } },
+            errors: undefined,
           })
         })
 
@@ -429,6 +456,7 @@ describe('moderate resources', () => {
                 report: { id: expect.any(String), closed: true },
               },
             },
+            errors: undefined,
           })
         })
       })
@@ -474,24 +502,6 @@ describe('moderate resources', () => {
           authenticatedUser = await moderator.toJson()
         })
 
-        describe('moderate a resource that is not a (Comment|Post|User) ', () => {
-          beforeEach(async () => {
-            await Promise.all([factory.create('Tag', { id: 'tag-id' })])
-          })
-
-          it('returns null', async () => {
-            enableVariables = {
-              ...enableVariables,
-              resourceId: 'tag-id',
-            }
-            await expect(
-              mutate({ mutation: reviewMutation, variables: enableVariables }),
-            ).resolves.toMatchObject({
-              data: { review: null },
-            })
-          })
-        })
-
         describe('moderate a comment', () => {
           beforeEach(async () => {
             const trollingComment = await factory.create('Comment', {

From c088c6eac47de1c33f51c2acd6fd8cb7a9f72c00 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Fri, 29 Nov 2019 20:48:11 +0100
Subject: [PATCH 119/174] Refactor test to avoid unneccessary http request

- Set up/tear down should not needlessly run http requests. These tests
are not designed to test that the report/review process works as
expected. that is the job of their respective unit tests/e2e tests.
---
 .../schema/resolvers/user_management.spec.js  | 50 ++++++-------------
 1 file changed, 15 insertions(+), 35 deletions(-)

diff --git a/backend/src/schema/resolvers/user_management.spec.js b/backend/src/schema/resolvers/user_management.spec.js
index fc7e21e6f..e67b90c8d 100644
--- a/backend/src/schema/resolvers/user_management.spec.js
+++ b/backend/src/schema/resolvers/user_management.spec.js
@@ -9,45 +9,25 @@ import { neode as getNeode } from '../../bootstrap/neo4j'
 
 const factory = Factory()
 const neode = getNeode()
-let query
-let mutate
-let variables
-let req
-let user
+let query, mutate, variables, req, user
 
 const disable = async id => {
-  await factory.create('User', { id: 'u2', role: 'moderator' })
-  const moderatorBearerToken = encode({ id: 'u2' })
-  req = { headers: { authorization: `Bearer ${moderatorBearerToken}` } }
-  await mutate({
-    mutation: gql`
-      mutation($resourceId: ID!, $reasonCategory: ReasonCategory!, $reasonDescription: String!) {
-        fileReport(
-          resourceId: $resourceId
-          reasonCategory: $reasonCategory
-          reasonDescription: $reasonDescription
-        ) {
-          type
-        }
-      }
-    `,
-    variables: {
+  const moderator = await factory.create('User', { id: 'u2', role: 'moderator' })
+  const user = await neode.find('User', id)
+  const reportAgainstUser = await factory.create('Report')
+  await Promise.all([
+    reportAgainstUser.relateTo(moderator, 'filed', {
       resourceId: id,
       reasonCategory: 'discrimination_etc',
-      reasonDescription: 'I am what I am !!!',
-    },
-  })
-  await mutate({
-    mutation: gql`
-      mutation($resourceId: ID!, $disable: Boolean, $closed: Boolean) {
-        review(resourceId: $resourceId, disable: $disable, closed: $closed) {
-          disable
-        }
-      }
-    `,
-    variables: { resourceId: id, disable: true, closed: false },
-  })
-  req = { headers: {} }
+      reasonDescription: 'This user is harassing me with bigoted remarks!',
+    }),
+    reportAgainstUser.relateTo(user, 'belongsTo'),
+  ])
+  const disableVariables = { resourceId: user.id, disable: true, closed: false }
+  await Promise.all([
+    reportAgainstUser.relateTo(moderator, 'reviewed', disableVariables),
+    user.update({ disabled: true, updatedAt: new Date().toISOString() }),
+  ])
 }
 
 beforeEach(() => {

From 985d53e52bdad4b68e579b94a25c2e000c4c9fbb Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Fri, 29 Nov 2019 20:49:46 +0100
Subject: [PATCH 120/174] Fix broken tests

---
 cypress/integration/common/report.js                 |  2 +-
 webapp/components/ContentMenu/ContentMenu.spec.js    | 12 ++++++------
 .../components/DropdownFilter/DropdownFilter.spec.js |  4 ++--
 .../DropdownFilter/DropdownFilter.story.js           |  4 ++--
 .../_new/generic/ReportsTable/ReportsTable.vue       |  1 -
 webapp/pages/notifications/index.spec.js             |  4 ++--
 6 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/cypress/integration/common/report.js b/cypress/integration/common/report.js
index 5b0f96cb4..9f62a2818 100644
--- a/cypress/integration/common/report.js
+++ b/cypress/integration/common/report.js
@@ -130,7 +130,7 @@ Given('somebody reported the following posts:', table => {
       .authenticateAs(submitter)
       .mutate(`mutation($resourceId: ID!, $reasonCategory: ReasonCategory!, $reasonDescription: String!) {
         fileReport(resourceId: $resourceId, reasonCategory: $reasonCategory, reasonDescription: $reasonDescription) {
-          type
+          id
         }
       }`, {
         resourceId,
diff --git a/webapp/components/ContentMenu/ContentMenu.spec.js b/webapp/components/ContentMenu/ContentMenu.spec.js
index 485c43145..8f93aa4a4 100644
--- a/webapp/components/ContentMenu/ContentMenu.spec.js
+++ b/webapp/components/ContentMenu/ContentMenu.spec.js
@@ -85,7 +85,7 @@ describe('ContentMenu.vue', () => {
           .filter(item => item.text() === 'post.menu.delete')
           .at(0)
           .trigger('click')
-        expect(openModalSpy).toHaveBeenCalledWith('delete')
+        expect(openModalSpy).toHaveBeenCalledWith('confirm', 'delete')
       })
     })
 
@@ -166,7 +166,7 @@ describe('ContentMenu.vue', () => {
           .filter(item => item.text() === 'comment.menu.delete')
           .at(0)
           .trigger('click')
-        expect(openModalSpy).toHaveBeenCalledWith('delete')
+        expect(openModalSpy).toHaveBeenCalledWith('confirm', 'delete')
       })
     })
 
@@ -332,7 +332,7 @@ describe('ContentMenu.vue', () => {
           .filter(item => item.text() === 'release.contribution.title')
           .at(0)
           .trigger('click')
-        expect(openModalSpy).toHaveBeenCalledWith('release', 'd23a4265-f5f7-4e17-9f86-85f714b4b9f8')
+        expect(openModalSpy).toHaveBeenCalledWith('release')
       })
 
       it('can release comments', () => {
@@ -350,7 +350,7 @@ describe('ContentMenu.vue', () => {
           .filter(item => item.text() === 'release.comment.title')
           .at(0)
           .trigger('click')
-        expect(openModalSpy).toHaveBeenCalledWith('release', 'd23a4265-f5f7-4e17-9f86-85f714b4b9f8')
+        expect(openModalSpy).toHaveBeenCalledWith('release')
       })
 
       it('can release users', () => {
@@ -368,7 +368,7 @@ describe('ContentMenu.vue', () => {
           .filter(item => item.text() === 'release.user.title')
           .at(0)
           .trigger('click')
-        expect(openModalSpy).toHaveBeenCalledWith('release', 'd23a4265-f5f7-4e17-9f86-85f714b4b9f8')
+        expect(openModalSpy).toHaveBeenCalledWith('release')
       })
 
       it('can release organizations', () => {
@@ -386,7 +386,7 @@ describe('ContentMenu.vue', () => {
           .filter(item => item.text() === 'release.organization.title')
           .at(0)
           .trigger('click')
-        expect(openModalSpy).toHaveBeenCalledWith('release', 'd23a4265-f5f7-4e17-9f86-85f714b4b9f8')
+        expect(openModalSpy).toHaveBeenCalledWith('release')
       })
     })
 
diff --git a/webapp/components/DropdownFilter/DropdownFilter.spec.js b/webapp/components/DropdownFilter/DropdownFilter.spec.js
index 8020a487f..8fb1b408f 100644
--- a/webapp/components/DropdownFilter/DropdownFilter.spec.js
+++ b/webapp/components/DropdownFilter/DropdownFilter.spec.js
@@ -64,9 +64,9 @@ describe('DropdownFilter.vue', () => {
         expect(unreadLink.text()).toEqual('Unread')
       })
 
-      it('clicking on menu item emits filterNotifications', () => {
+      it('clicking on menu item emits filter', () => {
         allLink.trigger('click')
-        expect(wrapper.emitted().filterNotifications[0]).toEqual(
+        expect(wrapper.emitted().filter[0]).toEqual(
           propsData.filterOptions.filter(option => option.label === 'All'),
         )
       })
diff --git a/webapp/components/DropdownFilter/DropdownFilter.story.js b/webapp/components/DropdownFilter/DropdownFilter.story.js
index 0703c5c47..9bd750ac1 100644
--- a/webapp/components/DropdownFilter/DropdownFilter.story.js
+++ b/webapp/components/DropdownFilter/DropdownFilter.story.js
@@ -20,10 +20,10 @@ storiesOf('DropdownFilter', module)
       selected: filterOptions[0].label,
     }),
     methods: {
-      filterNotifications: action('filterNotifications'),
+      filter: action('filter'),
     },
     template: `<dropdown-filter
-                  @filterNotifications="filterNotifications"
+                  @filter="filter"
                   :filterOptions="filterOptions"
                   :selected="selected"
                 />`,
diff --git a/webapp/components/_new/generic/ReportsTable/ReportsTable.vue b/webapp/components/_new/generic/ReportsTable/ReportsTable.vue
index 337e6097d..fcafe131a 100644
--- a/webapp/components/_new/generic/ReportsTable/ReportsTable.vue
+++ b/webapp/components/_new/generic/ReportsTable/ReportsTable.vue
@@ -64,7 +64,6 @@
                   params: params(report.resource),
                   hash: hashParam(report.resource),
                 }"
-                @click.native="markNotificationAsRead(report.resource.id)"
               >
                 <b>{{ report.resource.title || report.resource.contentExcerpt | truncate(50) }}</b>
               </nuxt-link>
diff --git a/webapp/pages/notifications/index.spec.js b/webapp/pages/notifications/index.spec.js
index 61af56f63..66f68aac7 100644
--- a/webapp/pages/notifications/index.spec.js
+++ b/webapp/pages/notifications/index.spec.js
@@ -71,7 +71,7 @@ describe('PostIndex', () => {
       }
     })
 
-    describe('filterNotifications', () => {
+    describe('filter', () => {
       beforeEach(() => {
         propsData.filterOptions = [
           { label: 'All', value: null },
@@ -79,7 +79,7 @@ describe('PostIndex', () => {
           { label: 'Unread', value: false },
         ]
         wrapper = Wrapper()
-        wrapper.find(DropdownFilter).vm.$emit('filterNotifications', propsData.filterOptions[1])
+        wrapper.find(DropdownFilter).vm.$emit('filter', propsData.filterOptions[1])
       })
 
       it('sets `notificationRead` to value of received option', () => {

From 9fd895fc4292dc7ff8d6a842bd710961ea0ec31d Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Sat, 30 Nov 2019 01:31:57 +0100
Subject: [PATCH 121/174] Use <button> instead of <a>

If you don't want to link somewhere, use a button instead of an anchor,
fellas. :wink:
---
 webapp/components/_new/generic/ReportsTable/ReportsTable.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapp/components/_new/generic/ReportsTable/ReportsTable.vue b/webapp/components/_new/generic/ReportsTable/ReportsTable.vue
index fcafe131a..87216233d 100644
--- a/webapp/components/_new/generic/ReportsTable/ReportsTable.vue
+++ b/webapp/components/_new/generic/ReportsTable/ReportsTable.vue
@@ -50,9 +50,9 @@
             </ds-text>
             <ds-space margin-top="xx-large" margin-bottom="x-small">
               <counter-icon icon="flag" :count="report.filed.length">
-                <a @click="showFiledReports = !showFiledReports">
+                <ds-button ghost primary @click="showFiledReports = !showFiledReports">
                   {{ $t('moderation.reports.moreDetails') }}
-                </a>
+                </ds-button>
               </counter-icon>
             </ds-space>
           </td>

From 74a65a9114139bb5ab9156a0852c1d20d49385ae Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Sat, 30 Nov 2019 02:20:29 +0100
Subject: [PATCH 122/174] Be more specific "Current status" inst. of "Type"

---
 webapp/locales/de.json | 4 ++--
 webapp/locales/en.json | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index fdaeff5e1..d92bbe0f9 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -316,7 +316,7 @@
         "reports": {
             "empty": "Glückwunsch, es gibt nichts zu moderieren.",
             "name": "Meldungen",
-            "typeRowHeadline": "Typ",
+            "typeRowHeadline": "Aktueller Status",
             "contentRowHeadline": "Inhalt",
             "authorRowHeadline": "Autor",
             "decisionRowHeadline": "Entscheidung",
@@ -795,4 +795,4 @@
         "donate-now": "Jetzt spenden",
         "amount-of-total": "{amount} von {total} € erreicht"
     }
-}
\ No newline at end of file
+}
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 3e23e461d..0fe2b8eca 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -482,7 +482,7 @@
     "reports": {
       "empty": "Congratulations, nothing to moderate.",
       "name": "Reports",
-      "typeRowHeadline": "Type",
+      "typeRowHeadline": "Current status",
       "contentRowHeadline": "Content",
       "authorRowHeadline": "Author",
       "decisionRowHeadline": "Decision",

From 3409a34374024d8028c632a87e81fae9c775dab5 Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Sat, 30 Nov 2019 02:22:53 +0100
Subject: [PATCH 123/174] Always show the menu to switch filters

---
 .../_new/features/ReportList/ReportList.vue   |  5 +--
 .../generic/ReportsTable/ReportsTable.spec.js | 36 +++++++++++++++++++
 .../generic/ReportsTable/ReportsTable.vue     | 12 +++++--
 3 files changed, 47 insertions(+), 6 deletions(-)
 create mode 100644 webapp/components/_new/generic/ReportsTable/ReportsTable.spec.js

diff --git a/webapp/components/_new/features/ReportList/ReportList.vue b/webapp/components/_new/features/ReportList/ReportList.vue
index db03e9ca6..6b5488107 100644
--- a/webapp/components/_new/features/ReportList/ReportList.vue
+++ b/webapp/components/_new/features/ReportList/ReportList.vue
@@ -1,5 +1,5 @@
 <template>
-  <ds-card space="small" v-if="reports && reports.length">
+  <ds-card space="small">
     <ds-flex class="notifications-page-flex">
       <ds-flex-item :width="{ lg: '85%' }">
         <ds-heading tag="h3">{{ $t('moderation.reports.name') }}</ds-heading>
@@ -13,19 +13,16 @@
     <ds-space />
     <reports-table :reports="reports" @confirm="confirm" />
   </ds-card>
-  <hc-empty v-else icon="alert" :message="$t('moderation.reports.empty')" />
 </template>
 <script>
 import DropdownFilter from '~/components/DropdownFilter/DropdownFilter'
 import ReportsTable from '~/components/_new/generic/ReportsTable/ReportsTable'
-import HcEmpty from '~/components/Empty/Empty'
 import { reportsListQuery, reviewMutation } from '~/graphql/Moderation.js'
 
 export default {
   components: {
     DropdownFilter,
     ReportsTable,
-    HcEmpty,
   },
   data() {
     return {
diff --git a/webapp/components/_new/generic/ReportsTable/ReportsTable.spec.js b/webapp/components/_new/generic/ReportsTable/ReportsTable.spec.js
new file mode 100644
index 000000000..e8e7245a6
--- /dev/null
+++ b/webapp/components/_new/generic/ReportsTable/ReportsTable.spec.js
@@ -0,0 +1,36 @@
+import { config, mount } from '@vue/test-utils'
+import ReportsTable from './ReportsTable.vue'
+import Styleguide from '@human-connection/styleguide'
+
+const localVue = global.localVue
+localVue.use(Styleguide)
+
+config.stubs['client-only'] = '<span><slot /></span>'
+
+describe('ReportsTable', () => {
+  let propsData
+  let mocks
+  beforeEach(() => {
+    propsData = {}
+    mocks = {
+      $t: jest.fn(t => t),
+    }
+  })
+
+  describe('mount', () => {
+    const Wrapper = () => {
+      return mount(ReportsTable, { propsData, mocks, localVue })
+    }
+
+    describe('no reports', () => {
+      beforeEach(() => {
+        propsData = { ...propsData, reports: [] }
+      })
+
+      it('shows a placeholder', () => {
+        const wrapper = Wrapper()
+        expect(wrapper.text()).toContain('moderation.reports.empty')
+      })
+    })
+  })
+})
diff --git a/webapp/components/_new/generic/ReportsTable/ReportsTable.vue b/webapp/components/_new/generic/ReportsTable/ReportsTable.vue
index 87216233d..b11714223 100644
--- a/webapp/components/_new/generic/ReportsTable/ReportsTable.vue
+++ b/webapp/components/_new/generic/ReportsTable/ReportsTable.vue
@@ -1,6 +1,10 @@
 <template>
-  <table class="ds-table ds-table-condensed ds-table-bordered" cellspacing="0" cellpadding="0">
-    <colgroup><col width="" /></colgroup>
+  <table
+    v-if="reports && reports.length"
+    class="ds-table ds-table-condensed ds-table-bordered"
+    cellspacing="0"
+    cellpadding="0"
+  >
     <template v-for="report in reports">
       <thead
         :class="[
@@ -140,17 +144,21 @@
       </tbody>
     </template>
   </table>
+  <hc-empty v-else icon="alert" :message="$t('moderation.reports.empty')" />
 </template>
+
 <script>
 import CounterIcon from '~/components/_new/generic/CounterIcon/CounterIcon'
 import HcUser from '~/components/User/User'
 import FiledTable from '~/components/_new/generic/FiledTable/FiledTable'
+import HcEmpty from '~/components/Empty/Empty'
 
 export default {
   components: {
     CounterIcon,
     HcUser,
     FiledTable,
+    HcEmpty,
   },
   data() {
     return {

From 048fb511162c9c4a1e8175126dd724f2867e37b3 Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Sat, 30 Nov 2019 11:03:46 +0100
Subject: [PATCH 124/174] feat: swap user name<=>handle for discriminability

---
 webapp/components/User/User.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapp/components/User/User.vue b/webapp/components/User/User.vue
index 81d004ca8..2860c01d8 100644
--- a/webapp/components/User/User.vue
+++ b/webapp/components/User/User.vue
@@ -12,7 +12,7 @@
           <hc-avatar class="avatar" :user="user" />
           <div>
             <ds-text class="userinfo">
-              <b class="username">{{ userName | truncate(18) }}</b>
+              <b class="username">{{ userSlug }}</b>
               <ds-text v-if="dateTime" size="small" color="soft">
                 <base-icon name="clock" />
                 <client-only>
@@ -23,7 +23,7 @@
             </ds-text>
           </div>
           <ds-text align="left" size="small" color="soft">
-            {{ userSlug }}
+            {{  userName | truncate(18) }}
           </ds-text>
         </div>
       </nuxt-link>

From dd71c80f344d04f99b307c2cdeb67d6f454ba8cc Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 2 Dec 2019 04:18:25 +0000
Subject: [PATCH 125/174] build(deps-dev): bump eslint from 6.7.1 to 6.7.2 in
 /backend

Bumps [eslint](https://github.com/eslint/eslint) from 6.7.1 to 6.7.2.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v6.7.1...v6.7.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 backend/package.json | 2 +-
 backend/yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/backend/package.json b/backend/package.json
index 943096635..3f85286e7 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -111,7 +111,7 @@
     "babel-jest": "~24.9.0",
     "chai": "~4.2.0",
     "cucumber": "~6.0.5",
-    "eslint": "~6.7.1",
+    "eslint": "~6.7.2",
     "eslint-config-prettier": "~6.7.0",
     "eslint-config-standard": "~14.1.0",
     "eslint-plugin-import": "~2.18.2",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 984cfba3e..c1233c3ee 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -3385,10 +3385,10 @@ eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2"
   integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==
 
-eslint@~6.7.1:
-  version "6.7.1"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.7.1.tgz#269ccccec3ef60ab32358a44d147ac209154b919"
-  integrity sha512-UWzBS79pNcsDSxgxbdjkmzn/B6BhsXMfUaOHnNwyE8nD+Q6pyT96ow2MccVayUTV4yMid4qLhMiQaywctRkBLA==
+eslint@~6.7.2:
+  version "6.7.2"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.7.2.tgz#c17707ca4ad7b2d8af986a33feba71e18a9fecd1"
+  integrity sha512-qMlSWJaCSxDFr8fBPvJM9kJwbazrhNcBU3+DszDW1OlEwKBBRWsJc7NJFelvwQpanHCR14cOLD41x8Eqvo3Nng==
   dependencies:
     "@babel/code-frame" "^7.0.0"
     ajv "^6.10.0"

From 393d2dec02782a13202e22593f84d01f9a9cdccd Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 2 Dec 2019 04:19:00 +0000
Subject: [PATCH 126/174] build(deps-dev): bump eslint-plugin-jest in /backend

Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 23.0.5 to 23.1.1.
- [Release notes](https://github.com/jest-community/eslint-plugin-jest/releases)
- [Changelog](https://github.com/jest-community/eslint-plugin-jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jest-community/eslint-plugin-jest/compare/v23.0.5...v23.1.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 backend/package.json | 2 +-
 backend/yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/backend/package.json b/backend/package.json
index 943096635..81d179931 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -115,7 +115,7 @@
     "eslint-config-prettier": "~6.7.0",
     "eslint-config-standard": "~14.1.0",
     "eslint-plugin-import": "~2.18.2",
-    "eslint-plugin-jest": "~23.0.5",
+    "eslint-plugin-jest": "~23.1.1",
     "eslint-plugin-node": "~10.0.0",
     "eslint-plugin-prettier": "~3.1.1",
     "eslint-plugin-promise": "~4.2.1",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 984cfba3e..e7ef1f8d0 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -3329,10 +3329,10 @@ eslint-plugin-import@~2.18.2:
     read-pkg-up "^2.0.0"
     resolve "^1.11.0"
 
-eslint-plugin-jest@~23.0.5:
-  version "23.0.5"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-23.0.5.tgz#3c7c5e636c5a21677d2dfc8ba5424233ee2b9f27"
-  integrity sha512-etxXrWsFWzxsrxKwJnFC38uppH/vlJ3oF7Wmp/cxedqxRIxVhXup8e5y5MmtVXelevgxrgA1QS1vo8j889iK5Q==
+eslint-plugin-jest@~23.1.1:
+  version "23.1.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-23.1.1.tgz#1220ab53d5a4bf5c3c4cd07c0dabc6199d4064dd"
+  integrity sha512-2oPxHKNh4j1zmJ6GaCBuGcb8FVZU7YjFUOJzGOPnl9ic7VA/MGAskArLJiRIlnFUmi1EUxY+UiATAy8dv8s5JA==
   dependencies:
     "@typescript-eslint/experimental-utils" "^2.5.0"
 

From 6520a64b61be4c6ed1d2f3ee9b8cf81e48b8ed15 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 2 Dec 2019 04:20:20 +0000
Subject: [PATCH 127/174] build(deps-dev): bump @storybook/addon-a11y in
 /webapp

Bumps [@storybook/addon-a11y](https://github.com/storybookjs/storybook/tree/HEAD/addons/a11y) from 5.2.6 to 5.2.7.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v5.2.7/addons/a11y)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 webapp/package.json |   2 +-
 webapp/yarn.lock    | 133 ++++++++++++++++++++++++++++++++++++++++----
 2 files changed, 124 insertions(+), 11 deletions(-)

diff --git a/webapp/package.json b/webapp/package.json
index a8fbfbcf5..4da376942 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -100,7 +100,7 @@
     "@babel/core": "~7.7.4",
     "@babel/plugin-syntax-dynamic-import": "^7.2.0",
     "@babel/preset-env": "~7.7.4",
-    "@storybook/addon-a11y": "^5.2.6",
+    "@storybook/addon-a11y": "^5.2.7",
     "@storybook/addon-actions": "^5.2.6",
     "@storybook/addon-notes": "^5.2.5",
     "@storybook/vue": "~5.2.6",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index a45b3e378..b01a86cff 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -2043,17 +2043,17 @@
     source-map-support "^0.5.7"
     tslib "^1.9.3"
 
-"@storybook/addon-a11y@^5.2.6":
-  version "5.2.6"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-a11y/-/addon-a11y-5.2.6.tgz#8aa603cac1eaa92ef53c51b842e502101dc5d074"
-  integrity sha512-LlY5TaZNDxl5MP8u2qCJmg8GhvbtYGXmWJv0GMof0cw1fuLMEBHKAa5vK2oWQdPjGpoSAYN80dqn3TyCqsoGnQ==
+"@storybook/addon-a11y@^5.2.7":
+  version "5.2.7"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-a11y/-/addon-a11y-5.2.7.tgz#0e35a9bc745e07b86cb70d8075ede5de76711ad6"
+  integrity sha512-DC9edBEt0zA92ZaoUpROvfZFk9gVrMefhEvyDrGvVpmbyI0VTgAL+iCyA0t+YelghkidqNoIIQhA0U9op/HJQw==
   dependencies:
-    "@storybook/addons" "5.2.6"
-    "@storybook/api" "5.2.6"
-    "@storybook/client-logger" "5.2.6"
-    "@storybook/components" "5.2.6"
-    "@storybook/core-events" "5.2.6"
-    "@storybook/theming" "5.2.6"
+    "@storybook/addons" "5.2.7"
+    "@storybook/api" "5.2.7"
+    "@storybook/client-logger" "5.2.7"
+    "@storybook/components" "5.2.7"
+    "@storybook/core-events" "5.2.7"
+    "@storybook/theming" "5.2.7"
     axe-core "^3.3.2"
     common-tags "^1.8.0"
     core-js "^3.0.1"
@@ -2130,6 +2130,19 @@
     global "^4.3.2"
     util-deprecate "^1.0.2"
 
+"@storybook/addons@5.2.7":
+  version "5.2.7"
+  resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-5.2.7.tgz#a868ca0a209aefa8a17718b58327dd3ff37f2d76"
+  integrity sha512-eWRSvs5/28KhU28iWjClfOryRN1IuycFcWEJrRtMOXyf44TTyzEC5PbH35eGh33MpWVJYM+8CUJQqNOxxDVjBw==
+  dependencies:
+    "@storybook/api" "5.2.7"
+    "@storybook/channels" "5.2.7"
+    "@storybook/client-logger" "5.2.7"
+    "@storybook/core-events" "5.2.7"
+    core-js "^3.0.1"
+    global "^4.3.2"
+    util-deprecate "^1.0.2"
+
 "@storybook/api@5.1.9":
   version "5.1.9"
   resolved "https://registry.yarnpkg.com/@storybook/api/-/api-5.1.9.tgz#eec5b2f775392ce0803930104c6ce14fa4931e8b"
@@ -2176,6 +2189,29 @@
     telejson "^3.0.2"
     util-deprecate "^1.0.2"
 
+"@storybook/api@5.2.7":
+  version "5.2.7"
+  resolved "https://registry.yarnpkg.com/@storybook/api/-/api-5.2.7.tgz#f0c04c975b2c7359ce67a581a178cf1c52ffc1cd"
+  integrity sha512-d0tu8GZTCBQqEr2P75mRrDw6t2LMPVcLETo7Pc02LkOjV5mZ9Q6rObAuUAM/flBQMbv24ioNa9HPk2ilspf/iQ==
+  dependencies:
+    "@storybook/channels" "5.2.7"
+    "@storybook/client-logger" "5.2.7"
+    "@storybook/core-events" "5.2.7"
+    "@storybook/router" "5.2.7"
+    "@storybook/theming" "5.2.7"
+    core-js "^3.0.1"
+    fast-deep-equal "^2.0.1"
+    global "^4.3.2"
+    lodash "^4.17.15"
+    memoizerific "^1.11.3"
+    prop-types "^15.6.2"
+    react "^16.8.3"
+    semver "^6.0.0"
+    shallow-equal "^1.1.0"
+    store2 "^2.7.1"
+    telejson "^3.0.2"
+    util-deprecate "^1.0.2"
+
 "@storybook/channel-postmessage@5.2.6":
   version "5.2.6"
   resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-5.2.6.tgz#60aaef0e80300c9812a571ca3ce0f28e2c404f04"
@@ -2201,6 +2237,13 @@
   dependencies:
     core-js "^3.0.1"
 
+"@storybook/channels@5.2.7":
+  version "5.2.7"
+  resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-5.2.7.tgz#7cd55f1a25c68588795ddc6cbe5bb53ee8f8bb69"
+  integrity sha512-q3+fxc6aBU60XaihVJ2P2xrVOiCgimTTEzt1KkRr5ZzD27m4LnF0iDaVnJSlEJv7PpaqqewUb6lHhsQLjfWKMg==
+  dependencies:
+    core-js "^3.0.1"
+
 "@storybook/client-api@5.2.6":
   version "5.2.6"
   resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-5.2.6.tgz#5760cb4302d82ce9210a63f3f55b1e05f04759c1"
@@ -2236,6 +2279,13 @@
   dependencies:
     core-js "^3.0.1"
 
+"@storybook/client-logger@5.2.7":
+  version "5.2.7"
+  resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-5.2.7.tgz#aa8bdcfc0a981d8505e60ec1548436eabd28e64e"
+  integrity sha512-gomUNoc5bBl+YEJhrHMr5anmu4k8/AYmF5omp5OaWaF74HfH/a33L8p4L7yHdFWK7zpqlfi6SrBl3gptzvnljA==
+  dependencies:
+    core-js "^3.0.1"
+
 "@storybook/components@5.1.9":
   version "5.1.9"
   resolved "https://registry.yarnpkg.com/@storybook/components/-/components-5.1.9.tgz#2a5258780fff07172d103287759946dbb4b13e2d"
@@ -2285,6 +2335,31 @@
     react-textarea-autosize "^7.1.0"
     simplebar-react "^1.0.0-alpha.6"
 
+"@storybook/components@5.2.7":
+  version "5.2.7"
+  resolved "https://registry.yarnpkg.com/@storybook/components/-/components-5.2.7.tgz#810327a517dc839293ef1d684f960a548e257689"
+  integrity sha512-BRmfSMXqiDDWwgYKTyq0XseCYhETvlBzljAqIeI+xuSPh4FzRY1uoXrD3yJJo/jtEfP+vtEV98/6g3pmZf3pBw==
+  dependencies:
+    "@storybook/client-logger" "5.2.7"
+    "@storybook/theming" "5.2.7"
+    "@types/react-syntax-highlighter" "10.1.0"
+    "@types/react-textarea-autosize" "^4.3.3"
+    core-js "^3.0.1"
+    global "^4.3.2"
+    markdown-to-jsx "^6.9.1"
+    memoizerific "^1.11.3"
+    polished "^3.3.1"
+    popper.js "^1.14.7"
+    prop-types "^15.7.2"
+    react "^16.8.3"
+    react-dom "^16.8.3"
+    react-focus-lock "^1.18.3"
+    react-helmet-async "^1.0.2"
+    react-popper-tooltip "^2.8.3"
+    react-syntax-highlighter "^8.0.1"
+    react-textarea-autosize "^7.1.0"
+    simplebar-react "^1.0.0-alpha.6"
+
 "@storybook/core-events@5.1.9":
   version "5.1.9"
   resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-5.1.9.tgz#441a6297e2ccfa743e15d1db1f4ac445b91f40d8"
@@ -2299,6 +2374,13 @@
   dependencies:
     core-js "^3.0.1"
 
+"@storybook/core-events@5.2.7":
+  version "5.2.7"
+  resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-5.2.7.tgz#624a4ea04f62e7002871b4d13892970955859401"
+  integrity sha512-DZG/CdLhINmnSysBEFTMyUPiXGuhtsxZA+v2yO3X09IHai/LWXW6Diyiz+h81m4z2w/SYQeoD96wZ9wNbyaYwA==
+  dependencies:
+    core-js "^3.0.1"
+
 "@storybook/core@5.2.6":
   version "5.2.6"
   resolved "https://registry.yarnpkg.com/@storybook/core/-/core-5.2.6.tgz#60c092607158d7d28db59f7e67da4f7e12703fb2"
@@ -2408,6 +2490,19 @@
     memoizerific "^1.11.3"
     qs "^6.6.0"
 
+"@storybook/router@5.2.7":
+  version "5.2.7"
+  resolved "https://registry.yarnpkg.com/@storybook/router/-/router-5.2.7.tgz#4c9e48667a1e23a86a9fdd5810722e73b12f35f5"
+  integrity sha512-6xXAjc+4OtLXEGFacFKHpUDooZlRODwLSGYL0UDuPMpFwBDPZvuIaNtG18m3yhAgjWqoH7kS/bwKwtosno9/xg==
+  dependencies:
+    "@reach/router" "^1.2.1"
+    "@types/reach__router" "^1.2.3"
+    core-js "^3.0.1"
+    global "^4.3.2"
+    lodash "^4.17.15"
+    memoizerific "^1.11.3"
+    qs "^6.6.0"
+
 "@storybook/theming@5.1.9":
   version "5.1.9"
   resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-5.1.9.tgz#c425f5867fae0db79e01112853b1808332a5f1a2"
@@ -2444,6 +2539,24 @@
     prop-types "^15.7.2"
     resolve-from "^5.0.0"
 
+"@storybook/theming@5.2.7":
+  version "5.2.7"
+  resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-5.2.7.tgz#8db0f7e1b2c4c17befbf4bcd7c60f75ff4369105"
+  integrity sha512-MroOG2lUB8dPZu8ZKwAuP8NV4ozG/8FpkWHZ/1HtBAAtGCvVNrXuSKIvI/pabfJaJvms+1uh95K7riY8t7CUWw==
+  dependencies:
+    "@emotion/core" "^10.0.14"
+    "@emotion/styled" "^10.0.14"
+    "@storybook/client-logger" "5.2.7"
+    common-tags "^1.8.0"
+    core-js "^3.0.1"
+    deep-object-diff "^1.1.0"
+    emotion-theming "^10.0.14"
+    global "^4.3.2"
+    memoizerific "^1.11.3"
+    polished "^3.3.1"
+    prop-types "^15.7.2"
+    resolve-from "^5.0.0"
+
 "@storybook/ui@5.2.6":
   version "5.2.6"
   resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-5.2.6.tgz#33df2f2e03d9cf81dc52928a0dc4db280ee8f56a"

From 00d5f58b00fd246084b60d8e9311d16ac9885680 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Mon, 2 Dec 2019 11:26:11 +0100
Subject: [PATCH 128/174] Move components to features, style table[WIP]

- In conversations with @alina-beck, she suggested we move the
ReportsTable and FiledTable to features since it is tightly coupled to
Reports... we can work towards a table that is "dumb" and just takes the
data and displays it in another PR
- Add extra column for Current status
- Fix widths
---
 .../FiledTable/FiledTable.vue                 |  0
 .../_new/features/ReportList/ReportList.vue   |  2 +-
 .../ReportsTable/ReportsTable.spec.js         |  0
 .../ReportsTable/ReportsTable.vue             | 80 ++++++++++---------
 4 files changed, 44 insertions(+), 38 deletions(-)
 rename webapp/components/_new/{generic => features}/FiledTable/FiledTable.vue (100%)
 rename webapp/components/_new/{generic => features}/ReportsTable/ReportsTable.spec.js (100%)
 rename webapp/components/_new/{generic => features}/ReportsTable/ReportsTable.vue (81%)

diff --git a/webapp/components/_new/generic/FiledTable/FiledTable.vue b/webapp/components/_new/features/FiledTable/FiledTable.vue
similarity index 100%
rename from webapp/components/_new/generic/FiledTable/FiledTable.vue
rename to webapp/components/_new/features/FiledTable/FiledTable.vue
diff --git a/webapp/components/_new/features/ReportList/ReportList.vue b/webapp/components/_new/features/ReportList/ReportList.vue
index 6b5488107..2a141a875 100644
--- a/webapp/components/_new/features/ReportList/ReportList.vue
+++ b/webapp/components/_new/features/ReportList/ReportList.vue
@@ -16,7 +16,7 @@
 </template>
 <script>
 import DropdownFilter from '~/components/DropdownFilter/DropdownFilter'
-import ReportsTable from '~/components/_new/generic/ReportsTable/ReportsTable'
+import ReportsTable from '~/components/_new/features/ReportsTable/ReportsTable'
 import { reportsListQuery, reviewMutation } from '~/graphql/Moderation.js'
 
 export default {
diff --git a/webapp/components/_new/generic/ReportsTable/ReportsTable.spec.js b/webapp/components/_new/features/ReportsTable/ReportsTable.spec.js
similarity index 100%
rename from webapp/components/_new/generic/ReportsTable/ReportsTable.spec.js
rename to webapp/components/_new/features/ReportsTable/ReportsTable.spec.js
diff --git a/webapp/components/_new/generic/ReportsTable/ReportsTable.vue b/webapp/components/_new/features/ReportsTable/ReportsTable.vue
similarity index 81%
rename from webapp/components/_new/generic/ReportsTable/ReportsTable.vue
rename to webapp/components/_new/features/ReportsTable/ReportsTable.vue
index b11714223..a8fa669db 100644
--- a/webapp/components/_new/generic/ReportsTable/ReportsTable.vue
+++ b/webapp/components/_new/features/ReportsTable/ReportsTable.vue
@@ -1,30 +1,33 @@
 <template>
   <table
     v-if="reports && reports.length"
-    class="ds-table ds-table-condensed ds-table-bordered"
+    class="ds-table ds-table-condensed"
     cellspacing="0"
     cellpadding="0"
   >
+    <colgroup>
+      <col width="5%" />
+      <col width="35%" />
+      <col width="20%" />
+      <col width="20%" />
+      <col width="20%" />
+    </colgroup>
     <template v-for="report in reports">
       <thead
-        :class="[
-          report.closed ? 'decision' : 'no-decision',
-          'ds-table-col',
-          'ds-table-head-col',
-          'ds-table-head-col-border',
-        ]"
+        :class="[report.closed ? 'decision' : 'no-decision', 'ds-table-col', 'ds-table-head-col']"
         :key="'thead-' + report.resource.id"
       >
         <tr valign="top">
-          <th>
-            {{ $t('moderation.reports.typeRowHeadline') }}
-          </th>
+          <th></th>
           <th>
             {{ $t('moderation.reports.contentRowHeadline') }}
           </th>
           <th>
             {{ $t('moderation.reports.authorRowHeadline') }}
           </th>
+          <th>
+            {{ $t('moderation.reports.typeRowHeadline') }}
+          </th>
           <th>
             {{ $t('moderation.reports.decisionRowHeadline') }}
           </th>
@@ -32,7 +35,7 @@
       </thead>
       <tbody :key="'tbody-' + report.resource.id">
         <tr valign="top">
-          <td class="ds-table-col ds-table-head-col ds-table-head-col-border">
+          <td class="ds-table-col">
             <ds-text color="soft">
               <base-icon
                 v-if="isPost(report.resource)"
@@ -49,18 +52,9 @@
                 v-tooltip="{ report: $t('report.user.type'), placement: 'right' }"
                 name="user"
               />
-              <base-icon v-if="report.resource.disabled" name="eye-slash" class="ban" />
-              <base-icon v-else name="eye" class="no-ban" />
             </ds-text>
-            <ds-space margin-top="xx-large" margin-bottom="x-small">
-              <counter-icon icon="flag" :count="report.filed.length">
-                <ds-button ghost primary @click="showFiledReports = !showFiledReports">
-                  {{ $t('moderation.reports.moreDetails') }}
-                </ds-button>
-              </counter-icon>
-            </ds-space>
           </td>
-          <td class="ds-table-col ds-table-head-col-border">
+          <td class="ds-table-col ">
             <div v-if="isPost(report.resource) || isComment(report.resource)">
               <nuxt-link
                 :to="{
@@ -78,7 +72,7 @@
               </client-only>
             </div>
           </td>
-          <td class="ds-table-col ds-table-head-col-border">
+          <td class="ds-table-col ">
             <client-only>
               <hc-user
                 v-if="report.resource.__typename !== 'User'"
@@ -89,19 +83,7 @@
               <span v-else>—</span>
             </client-only>
           </td>
-          <td class="ds-table-col ds-table-head-col-border">
-            <b v-if="report.closed">
-              {{ $t('moderation.reports.decided') }}
-            </b>
-            <ds-button
-              v-else
-              danger
-              class="confirm"
-              :icon="report.resource.disabled ? 'eye-slash' : 'eye'"
-              @click="confirm(report)"
-            >
-              {{ $t('moderation.reports.decideButton') }}
-            </ds-button>
+          <td>
             <div v-if="report.reviewed">
               <br />
               <div v-if="report.resource.disabled">
@@ -134,9 +116,33 @@
               </div>
             </div>
           </td>
+          <td class="ds-table-col">
+            <b v-if="report.closed">
+              {{ $t('moderation.reports.decided') }}
+            </b>
+            <ds-button
+              v-else
+              danger
+              class="confirm"
+              :icon="report.resource.disabled ? 'eye-slash' : 'eye'"
+              @click="confirm(report)"
+            >
+              {{ $t('moderation.reports.decideButton') }}
+            </ds-button>
+          </td>
         </tr>
         <tr>
-          <td class="ds-table-col ds-table-head-col-border filed-table" colspan="4">
+          <td></td>
+          <td>
+            <counter-icon icon="flag" :count="report.filed.length">
+              <ds-button ghost primary @click="showFiledReports = !showFiledReports">
+                {{ $t('moderation.reports.moreDetails') }}
+              </ds-button>
+            </counter-icon>
+          </td>
+        </tr>
+        <tr>
+          <td class="ds-table-col filed-table" colspan="4">
             <ds-space margin-bottom="base" />
             <filed-table :filed="report.filed" v-if="showFiledReports" />
           </td>
@@ -150,7 +156,7 @@
 <script>
 import CounterIcon from '~/components/_new/generic/CounterIcon/CounterIcon'
 import HcUser from '~/components/User/User'
-import FiledTable from '~/components/_new/generic/FiledTable/FiledTable'
+import FiledTable from '~/components/_new/features/FiledTable/FiledTable'
 import HcEmpty from '~/components/Empty/Empty'
 
 export default {

From b9464592e8522e66fa7503d64ced05c65dd21673 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 2 Dec 2019 10:38:23 +0000
Subject: [PATCH 129/174] build(deps-dev): bump cypress-cucumber-preprocessor

Bumps [cypress-cucumber-preprocessor](https://github.com/TheBrainFamily/cypress-cucumber-preprocessor) from 1.16.2 to 1.17.0.
- [Release notes](https://github.com/TheBrainFamily/cypress-cucumber-preprocessor/releases)
- [Changelog](https://github.com/TheBrainFamily/cypress-cucumber-preprocessor/blob/master/CHANGELOG.md)
- [Commits](https://github.com/TheBrainFamily/cypress-cucumber-preprocessor/compare/v1.16.2...v1.17.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index aff935fca..2c1793041 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
     "codecov": "^3.6.1",
     "cross-env": "^6.0.3",
     "cypress": "^3.7.0",
-    "cypress-cucumber-preprocessor": "^1.16.2",
+    "cypress-cucumber-preprocessor": "^1.17.0",
     "cypress-file-upload": "^3.5.0",
     "cypress-plugin-retries": "^1.5.0",
     "date-fns": "^2.8.1",
diff --git a/yarn.lock b/yarn.lock
index a4cd308ad..29edc575a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1939,10 +1939,10 @@ cucumber@^4.2.1:
     util-arity "^1.0.2"
     verror "^1.9.0"
 
-cypress-cucumber-preprocessor@^1.16.2:
-  version "1.16.2"
-  resolved "https://registry.yarnpkg.com/cypress-cucumber-preprocessor/-/cypress-cucumber-preprocessor-1.16.2.tgz#79e0ce7e7afa781f752711f7284a3bf48aa99ab8"
-  integrity sha512-jDJuQnnzrOrO+4PRt+VKFkHxHO7DplJACXOMUHLLWcL7vjlRUkIG4+QWnOkn/Py3yOhv9Rmuug8Iil5+FV8wEw==
+cypress-cucumber-preprocessor@^1.17.0:
+  version "1.17.0"
+  resolved "https://registry.yarnpkg.com/cypress-cucumber-preprocessor/-/cypress-cucumber-preprocessor-1.17.0.tgz#c0f60f1e4b408300bd46acbf0be29d791b299771"
+  integrity sha512-nj3qIgb3DDRzeefWZoFr78XuLKkPmMzEvw3apgADWsR8j16C6stoJQYtN0+HYrL9B30nPeJzW7bbgHMHbps0Zg==
   dependencies:
     "@cypress/browserify-preprocessor" "^2.1.1"
     chai "^4.1.2"

From ef8e0e04c840cb520318eaecf5abd9513b81fd47 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 2 Dec 2019 10:49:53 +0000
Subject: [PATCH 130/174] build(deps-dev): bump @vue/cli-shared-utils in
 /webapp

Bumps [@vue/cli-shared-utils](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-shared-utils) from 4.0.5 to 4.1.1.
- [Release notes](https://github.com/vuejs/vue-cli/releases)
- [Changelog](https://github.com/vuejs/vue-cli/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-cli/commits/v4.1.1/packages/@vue/cli-shared-utils)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 webapp/package.json |  2 +-
 webapp/yarn.lock    | 43 ++++++++++++++++++++++++++++---------------
 2 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/webapp/package.json b/webapp/package.json
index 7cc5317ca..258d6ce91 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -104,7 +104,7 @@
     "@storybook/addon-actions": "^5.2.6",
     "@storybook/addon-notes": "^5.2.5",
     "@storybook/vue": "~5.2.6",
-    "@vue/cli-shared-utils": "~4.0.5",
+    "@vue/cli-shared-utils": "~4.1.1",
     "@vue/eslint-config-prettier": "~6.0.0",
     "@vue/server-test-utils": "~1.0.0-beta.30",
     "@vue/test-utils": "~1.0.0-beta.29",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index fd9c0289d..9f7dbfe49 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -2968,10 +2968,10 @@
     "@vue/babel-plugin-transform-vue-jsx" "^1.0.0"
     camelcase "^5.0.0"
 
-"@vue/cli-shared-utils@~4.0.5":
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/@vue/cli-shared-utils/-/cli-shared-utils-4.0.5.tgz#dd263fa3b3a75c11cdc64376d4c45470fba6b270"
-  integrity sha512-NlNZ4Dx5QcP5uO5fCOLgkN2tbhNan5EcptPvXawW/md18cIpMlKbph6L6lEfJj8vrSvTUf2i/FyoFSh1rV53hw==
+"@vue/cli-shared-utils@~4.1.1":
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/@vue/cli-shared-utils/-/cli-shared-utils-4.1.1.tgz#79e26b56fda185fda00e5787a8f4aac56757b123"
+  integrity sha512-nsxNW8Sy9y2yx/r9DqgZoYg/DoygvASIQl0XXG+imQUDWEXKmD6UZA6y5ANfStCljzZ/wd7WgWP+txmjy6exOw==
   dependencies:
     "@hapi/joi" "^15.0.1"
     chalk "^2.4.1"
@@ -2982,9 +2982,10 @@
     open "^6.3.0"
     ora "^3.4.0"
     request "^2.87.0"
-    request-promise-native "^1.0.7"
+    request-promise-native "^1.0.8"
     semver "^6.1.0"
     string.prototype.padstart "^3.0.0"
+    strip-ansi "^6.0.0"
 
 "@vue/component-compiler-utils@^3.0.0":
   version "3.0.0"
@@ -3400,6 +3401,11 @@ ansi-regex@^4.0.0, ansi-regex@^4.1.0:
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
   integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
 
+ansi-regex@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
+  integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==
+
 ansi-styles@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
@@ -13866,19 +13872,19 @@ repeating@^2.0.0:
   dependencies:
     is-finite "^1.0.0"
 
-request-promise-core@1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.2.tgz#339f6aababcafdb31c799ff158700336301d3346"
-  integrity sha512-UHYyq1MO8GsefGEt7EprS8UrXsm1TxEvFUX1IMTuSLU2Rh7fTIdFtl8xD7JiEYiWU2dl+NYAjCTksTehQUxPag==
+request-promise-core@1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.3.tgz#e9a3c081b51380dfea677336061fea879a829ee9"
+  integrity sha512-QIs2+ArIGQVp5ZYbWD5ZLCY29D5CfWizP8eWnm8FoGD1TX61veauETVQbrV60662V0oFBkrDOuaBI8XgtuyYAQ==
   dependencies:
-    lodash "^4.17.11"
+    lodash "^4.17.15"
 
-request-promise-native@^1.0.5, request-promise-native@^1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.7.tgz#a49868a624bdea5069f1251d0a836e0d89aa2c59"
-  integrity sha512-rIMnbBdgNViL37nZ1b3L/VfPOpSi0TqVDQPAvO6U14lMzOLrt5nilxCQqtDKhZeDiW0/hkCXGoQjhgJd/tCh6w==
+request-promise-native@^1.0.5, request-promise-native@^1.0.8:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.8.tgz#a455b960b826e44e2bf8999af64dff2bfe58cb36"
+  integrity sha512-dapwLGqkHtwL5AEbfenuzjTYg35Jd6KPytsC2/TLkVMz8rm+tNt72MGUWT1RP/aYawMpN6HqbNGBQaRcBtjQMQ==
   dependencies:
-    request-promise-core "1.1.2"
+    request-promise-core "1.1.3"
     stealthy-require "^1.1.1"
     tough-cookie "^2.3.3"
 
@@ -15153,6 +15159,13 @@ strip-ansi@^4.0.0:
   dependencies:
     ansi-regex "^3.0.0"
 
+strip-ansi@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532"
+  integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==
+  dependencies:
+    ansi-regex "^5.0.0"
+
 strip-bom@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"

From 559737d8e43a28aeed39add78d36cde0d5b770d4 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 2 Dec 2019 10:50:25 +0000
Subject: [PATCH 131/174] build(deps-dev): bump eslint-plugin-jest in /webapp

Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 23.0.5 to 23.1.1.
- [Release notes](https://github.com/jest-community/eslint-plugin-jest/releases)
- [Changelog](https://github.com/jest-community/eslint-plugin-jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jest-community/eslint-plugin-jest/compare/v23.0.5...v23.1.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 webapp/package.json | 2 +-
 webapp/yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/webapp/package.json b/webapp/package.json
index 7cc5317ca..2446839ec 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -122,7 +122,7 @@
     "eslint-config-standard": "~14.1.0",
     "eslint-loader": "~3.0.2",
     "eslint-plugin-import": "~2.18.2",
-    "eslint-plugin-jest": "~23.0.5",
+    "eslint-plugin-jest": "~23.1.1",
     "eslint-plugin-node": "~10.0.0",
     "eslint-plugin-prettier": "~3.1.1",
     "eslint-plugin-promise": "~4.2.1",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index fd9c0289d..83a887ef1 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -7102,10 +7102,10 @@ eslint-plugin-import@~2.18.2:
     read-pkg-up "^2.0.0"
     resolve "^1.11.0"
 
-eslint-plugin-jest@~23.0.5:
-  version "23.0.5"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-23.0.5.tgz#3c7c5e636c5a21677d2dfc8ba5424233ee2b9f27"
-  integrity sha512-etxXrWsFWzxsrxKwJnFC38uppH/vlJ3oF7Wmp/cxedqxRIxVhXup8e5y5MmtVXelevgxrgA1QS1vo8j889iK5Q==
+eslint-plugin-jest@~23.1.1:
+  version "23.1.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-23.1.1.tgz#1220ab53d5a4bf5c3c4cd07c0dabc6199d4064dd"
+  integrity sha512-2oPxHKNh4j1zmJ6GaCBuGcb8FVZU7YjFUOJzGOPnl9ic7VA/MGAskArLJiRIlnFUmi1EUxY+UiATAy8dv8s5JA==
   dependencies:
     "@typescript-eslint/experimental-utils" "^2.5.0"
 

From f2d4980ed8503b13b8749937e557462380db676d Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 2 Dec 2019 10:51:05 +0000
Subject: [PATCH 132/174] build(deps-dev): bump @storybook/addon-notes in
 /webapp

Bumps [@storybook/addon-notes](https://github.com/storybookjs/storybook/tree/HEAD/addons/notes) from 5.2.6 to 5.2.8.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v5.2.8/addons/notes)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 webapp/package.json |   2 +-
 webapp/yarn.lock    | 145 ++++++++++++++++++++++++++++++++++++++------
 2 files changed, 126 insertions(+), 21 deletions(-)

diff --git a/webapp/package.json b/webapp/package.json
index f999a2e14..e777f2395 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -102,7 +102,7 @@
     "@babel/preset-env": "~7.7.4",
     "@storybook/addon-a11y": "^5.2.7",
     "@storybook/addon-actions": "^5.2.6",
-    "@storybook/addon-notes": "^5.2.5",
+    "@storybook/addon-notes": "^5.2.8",
     "@storybook/vue": "~5.2.6",
     "@vue/cli-shared-utils": "~4.0.5",
     "@vue/eslint-config-prettier": "~6.0.0",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index 7453a3e9c..7d86e0df4 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -2086,18 +2086,18 @@
     react-inspector "^3.0.2"
     uuid "^3.3.2"
 
-"@storybook/addon-notes@^5.2.5":
-  version "5.2.6"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-notes/-/addon-notes-5.2.6.tgz#bf74ff4f8018e315a4c07c3d5e90cd9154ce6e8e"
-  integrity sha512-CfWOkoPFI1ZAWQYnwFVqGmeCeXnVQGoFyDSVc3NcIFF1lsk2aagGV+ifJMJuDTXIKu0FClKpvMcENWt+bBpA+w==
+"@storybook/addon-notes@^5.2.8":
+  version "5.2.8"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-notes/-/addon-notes-5.2.8.tgz#9a4c90696aae64626e892b1a0f647ae79bab56a7"
+  integrity sha512-6we9WUD4cQzGhy9yej7ob+5SWk5OZ2BC1PWEcZOR/GcgYSWNk8cNNnpqAlFqB+DAQk5yawZ41MhQom0NT6LWOw==
   dependencies:
-    "@storybook/addons" "5.2.6"
-    "@storybook/api" "5.2.6"
-    "@storybook/client-logger" "5.2.6"
-    "@storybook/components" "5.2.6"
-    "@storybook/core-events" "5.2.6"
-    "@storybook/router" "5.2.6"
-    "@storybook/theming" "5.2.6"
+    "@storybook/addons" "5.2.8"
+    "@storybook/api" "5.2.8"
+    "@storybook/client-logger" "5.2.8"
+    "@storybook/components" "5.2.8"
+    "@storybook/core-events" "5.2.8"
+    "@storybook/router" "5.2.8"
+    "@storybook/theming" "5.2.8"
     core-js "^3.0.1"
     global "^4.3.2"
     markdown-to-jsx "^6.10.3"
@@ -2143,6 +2143,19 @@
     global "^4.3.2"
     util-deprecate "^1.0.2"
 
+"@storybook/addons@5.2.8":
+  version "5.2.8"
+  resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-5.2.8.tgz#f8bf8bd555b7a69fb1e9a52ab8cdb96384d931ff"
+  integrity sha512-yAo1N5z/45bNIQP8SD+HVTr7X898bYAtz1EZBrQ6zD8bGamzA2Br06rOLL9xXw29eQhsaVnPlqgDwCS1sTC7aQ==
+  dependencies:
+    "@storybook/api" "5.2.8"
+    "@storybook/channels" "5.2.8"
+    "@storybook/client-logger" "5.2.8"
+    "@storybook/core-events" "5.2.8"
+    core-js "^3.0.1"
+    global "^4.3.2"
+    util-deprecate "^1.0.2"
+
 "@storybook/api@5.1.9":
   version "5.1.9"
   resolved "https://registry.yarnpkg.com/@storybook/api/-/api-5.1.9.tgz#eec5b2f775392ce0803930104c6ce14fa4931e8b"
@@ -2212,6 +2225,29 @@
     telejson "^3.0.2"
     util-deprecate "^1.0.2"
 
+"@storybook/api@5.2.8":
+  version "5.2.8"
+  resolved "https://registry.yarnpkg.com/@storybook/api/-/api-5.2.8.tgz#21f03df8041114eb929bd10b570a17f266568b7f"
+  integrity sha512-rFrPtTFDIPQoicLwq1AVsOvZNTUKnjD1w/NX1kKcyuWLL9BcOkU3YNLBlliGBg2JX/yS+fJKMyKk4NMzNBCZCg==
+  dependencies:
+    "@storybook/channels" "5.2.8"
+    "@storybook/client-logger" "5.2.8"
+    "@storybook/core-events" "5.2.8"
+    "@storybook/router" "5.2.8"
+    "@storybook/theming" "5.2.8"
+    core-js "^3.0.1"
+    fast-deep-equal "^2.0.1"
+    global "^4.3.2"
+    lodash "^4.17.15"
+    memoizerific "^1.11.3"
+    prop-types "^15.6.2"
+    react "^16.8.3"
+    semver "^6.0.0"
+    shallow-equal "^1.1.0"
+    store2 "^2.7.1"
+    telejson "^3.0.2"
+    util-deprecate "^1.0.2"
+
 "@storybook/channel-postmessage@5.2.6":
   version "5.2.6"
   resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-5.2.6.tgz#60aaef0e80300c9812a571ca3ce0f28e2c404f04"
@@ -2244,6 +2280,13 @@
   dependencies:
     core-js "^3.0.1"
 
+"@storybook/channels@5.2.8":
+  version "5.2.8"
+  resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-5.2.8.tgz#79a99ad85dcacb688073c22340c5b7d16b801202"
+  integrity sha512-mFwQec27QSrqcl+IH0xA+4jfoEqC4m1G99LBHt/aTDjLZXclX1A470WqeZCp7Gx4OALpaPEVTaaaKPbiKz4C6w==
+  dependencies:
+    core-js "^3.0.1"
+
 "@storybook/client-api@5.2.6":
   version "5.2.6"
   resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-5.2.6.tgz#5760cb4302d82ce9210a63f3f55b1e05f04759c1"
@@ -2286,6 +2329,13 @@
   dependencies:
     core-js "^3.0.1"
 
+"@storybook/client-logger@5.2.8":
+  version "5.2.8"
+  resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-5.2.8.tgz#5affe2f9dbbee374721fd2e8729116f5ac39c779"
+  integrity sha512-+oVSEJdeh7TQ1Bhanb3mCr7fc3Bug3+K79abZ28J45Ub5x4L/ZVClj1xMgUsJs30BZ5FB8vhdgH6TQb0NSxR4A==
+  dependencies:
+    core-js "^3.0.1"
+
 "@storybook/components@5.1.9":
   version "5.1.9"
   resolved "https://registry.yarnpkg.com/@storybook/components/-/components-5.1.9.tgz#2a5258780fff07172d103287759946dbb4b13e2d"
@@ -2360,6 +2410,31 @@
     react-textarea-autosize "^7.1.0"
     simplebar-react "^1.0.0-alpha.6"
 
+"@storybook/components@5.2.8":
+  version "5.2.8"
+  resolved "https://registry.yarnpkg.com/@storybook/components/-/components-5.2.8.tgz#f5d4a06ba4ba8c700b2d962deae182105b72fb99"
+  integrity sha512-h9l/LAMaj+emUCOyY/+ETy/S3P0npwQU280J88uL4O9XJALJ72EKfyttBCvMLvpM50E+fAPeDzuYn0t5qzGGxg==
+  dependencies:
+    "@storybook/client-logger" "5.2.8"
+    "@storybook/theming" "5.2.8"
+    "@types/react-syntax-highlighter" "10.1.0"
+    "@types/react-textarea-autosize" "^4.3.3"
+    core-js "^3.0.1"
+    global "^4.3.2"
+    markdown-to-jsx "^6.9.1"
+    memoizerific "^1.11.3"
+    polished "^3.3.1"
+    popper.js "^1.14.7"
+    prop-types "^15.7.2"
+    react "^16.8.3"
+    react-dom "^16.8.3"
+    react-focus-lock "^1.18.3"
+    react-helmet-async "^1.0.2"
+    react-popper-tooltip "^2.8.3"
+    react-syntax-highlighter "^8.0.1"
+    react-textarea-autosize "^7.1.0"
+    simplebar-react "^1.0.0-alpha.6"
+
 "@storybook/core-events@5.1.9":
   version "5.1.9"
   resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-5.1.9.tgz#441a6297e2ccfa743e15d1db1f4ac445b91f40d8"
@@ -2381,6 +2456,13 @@
   dependencies:
     core-js "^3.0.1"
 
+"@storybook/core-events@5.2.8":
+  version "5.2.8"
+  resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-5.2.8.tgz#93fc458ea0820ff1409d268b0fe51abba200f5a4"
+  integrity sha512-NkQKC5doO/YL9gsO61bqaxgveKktkiJWZ3XyyhL1ZebgnO9wTlrU+i9b5aX73Myk1oxbicQw9KcwDGYk0qFuNQ==
+  dependencies:
+    core-js "^3.0.1"
+
 "@storybook/core@5.2.6":
   version "5.2.6"
   resolved "https://registry.yarnpkg.com/@storybook/core/-/core-5.2.6.tgz#60c092607158d7d28db59f7e67da4f7e12703fb2"
@@ -2503,6 +2585,19 @@
     memoizerific "^1.11.3"
     qs "^6.6.0"
 
+"@storybook/router@5.2.8":
+  version "5.2.8"
+  resolved "https://registry.yarnpkg.com/@storybook/router/-/router-5.2.8.tgz#d7de2d401701857c033e28560c30e16512f7f72f"
+  integrity sha512-wnbyKESUMyv9fwo9W+n4Fev/jXylB8whpjtHrOttjguUOYX1zGSHdwNI66voPetbtVLxUeHyJteJwdyRDSirJg==
+  dependencies:
+    "@reach/router" "^1.2.1"
+    "@types/reach__router" "^1.2.3"
+    core-js "^3.0.1"
+    global "^4.3.2"
+    lodash "^4.17.15"
+    memoizerific "^1.11.3"
+    qs "^6.6.0"
+
 "@storybook/theming@5.1.9":
   version "5.1.9"
   resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-5.1.9.tgz#c425f5867fae0db79e01112853b1808332a5f1a2"
@@ -2557,6 +2652,24 @@
     prop-types "^15.7.2"
     resolve-from "^5.0.0"
 
+"@storybook/theming@5.2.8":
+  version "5.2.8"
+  resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-5.2.8.tgz#a4c9e0e9a5789c1aa71e4fcb7a8ee86efe3dadcf"
+  integrity sha512-rGb66GkXb0jNJMH8UQ3Ru4FL+m1x0+UdxM8a8HSE/qb1GMv2qOwjVETfAL6nVL9u6ZmrtbhHoero4f6xDwZdRg==
+  dependencies:
+    "@emotion/core" "^10.0.14"
+    "@emotion/styled" "^10.0.14"
+    "@storybook/client-logger" "5.2.8"
+    common-tags "^1.8.0"
+    core-js "^3.0.1"
+    deep-object-diff "^1.1.0"
+    emotion-theming "^10.0.14"
+    global "^4.3.2"
+    memoizerific "^1.11.3"
+    polished "^3.3.1"
+    prop-types "^15.7.2"
+    resolve-from "^5.0.0"
+
 "@storybook/ui@5.2.6":
   version "5.2.6"
   resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-5.2.6.tgz#33df2f2e03d9cf81dc52928a0dc4db280ee8f56a"
@@ -10846,7 +10959,7 @@ map-visit@^1.0.0:
   dependencies:
     object-visit "^1.0.0"
 
-markdown-to-jsx@^6.10.3:
+markdown-to-jsx@^6.10.3, markdown-to-jsx@^6.9.1, markdown-to-jsx@^6.9.3:
   version "6.10.3"
   resolved "https://registry.yarnpkg.com/markdown-to-jsx/-/markdown-to-jsx-6.10.3.tgz#7f0946684acd321125ff2de7fd258a9b9c7c40b7"
   integrity sha512-PSoUyLnW/xoW6RsxZrquSSz5eGEOTwa15H5eqp3enmrp8esmgDJmhzd6zmQ9tgAA9TxJzx1Hmf3incYU/IamoQ==
@@ -10854,14 +10967,6 @@ markdown-to-jsx@^6.10.3:
     prop-types "^15.6.2"
     unquote "^1.1.0"
 
-markdown-to-jsx@^6.9.1, markdown-to-jsx@^6.9.3:
-  version "6.10.2"
-  resolved "https://registry.yarnpkg.com/markdown-to-jsx/-/markdown-to-jsx-6.10.2.tgz#644f602b81d088f10aef1c3674874876146cf38b"
-  integrity sha512-eDCsRobOkbQ4PqCphrxNi/U8geA8DGf52dMP4BrrYsVFyQ2ILFnXIB5sRcIxnRK2nPl8k5hUYdRNRXLlQNYLYg==
-  dependencies:
-    prop-types "^15.6.2"
-    unquote "^1.1.0"
-
 md5.js@^1.3.4:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f"

From 14a689d955beeffd5667b6476452effb9405ddb2 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Mon, 2 Dec 2019 12:02:15 +0100
Subject: [PATCH 133/174] Remove comments

---
 backend/src/seed/seed-db.js | 227 ------------------------------------
 1 file changed, 227 deletions(-)

diff --git a/backend/src/seed/seed-db.js b/backend/src/seed/seed-db.js
index cf701f89b..d059400a4 100644
--- a/backend/src/seed/seed-db.js
+++ b/backend/src/seed/seed-db.js
@@ -747,233 +747,6 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
       trollingComment.update({ disabled: true, updatedAt: new Date().toISOString(), closed: true }),
     ])
 
-    // There is no error logged or the 'try' fails if this mutation is wrong. Why?
-    // const reportMutation = gql`
-    //   mutation($resourceId: ID!, $reasonCategory: ReasonCategory!, $reasonDescription: String!) {
-    //     report(
-    //       resourceId: $resourceId
-    //       reasonCategory: $reasonCategory
-    //       reasonDescription: $reasonDescription
-    //     ) {
-    //       type
-    //     }
-    //   }
-    // `
-    // authenticatedUser = await huey.toJson()
-    // await Promise.all([
-    //   mutate({
-    //     mutation: reportMutation,
-    //     variables: {
-    //       resourceId: 'p11',
-    //       reasonCategory: 'discrimination_etc',
-    //       reasonDescription: 'I am what I am !!!',
-    //     },
-    //   }),
-    //   mutate({
-    //     mutation: reportMutation,
-    //     variables: {
-    //       resourceId: 'c5',
-    //       reasonCategory: 'doxing',
-    //       reasonDescription: "This shouldn't be shown to anybody else! It's my privat thing!",
-    //     },
-    //   }),
-    //   mutate({
-    //     mutation: reportMutation,
-    //     variables: {
-    //       resourceId: 'c1',
-    //       reasonCategory: 'other',
-    //       reasonDescription: 'This comment is bigoted',
-    //     },
-    //   }),
-    //   mutate({
-    //     mutation: reportMutation,
-    //     variables: {
-    //       resourceId: 'p1',
-    //       reasonCategory: 'discrimination_etc',
-    //       reasonDescription: 'This post is bigoted',
-    //     },
-    //   }),
-    //   mutate({
-    //     mutation: reportMutation,
-    //     variables: {
-    //       resourceId: 'p2',
-    //       reasonCategory: 'doxing',
-    //       reasonDescription: 'OMG my data !!!',
-    //     },
-    //   }),
-    //   mutate({
-    //     mutation: reportMutation,
-    //     variables: {
-    //       resourceId: 'u1',
-    //       reasonCategory: 'doxing',
-    //       reasonDescription: 'This user is harassing me with bigoted remarks',
-    //     },
-    //   }),
-    // ])
-    // authenticatedUser = await dewey.toJson()
-    // await Promise.all([
-    //   mutate({
-    //     mutation: reportMutation,
-    //     variables: {
-    //       resourceId: 'c5',
-    //       reasonCategory: 'doxing',
-    //       reasonDescription: "That's my friends privat data!",
-    //     },
-    //   }),
-    //   mutate({
-    //     mutation: reportMutation,
-    //     variables: {
-    //       resourceId: 'c1',
-    //       reasonCategory: 'pornographic_content_links',
-    //       reasonDescription: 'This comment is porno!!!',
-    //     },
-    //   }),
-    //   mutate({
-    //     mutation: reportMutation,
-    //     variables: {
-    //       resourceId: 'p1',
-    //       reasonCategory: 'intentional_intimidation_stalking_persecution',
-    //       reasonDescription: '',
-    //     },
-    //   }),
-    //   mutate({
-    //     mutation: reportMutation,
-    //     variables: {
-    //       resourceId: 'p2',
-    //       reasonCategory: 'intentional_intimidation_stalking_persecution',
-    //       reasonDescription: '',
-    //     },
-    //   }),
-    //   mutate({
-    //     mutation: reportMutation,
-    //     variables: {
-    //       resourceId: 'u1',
-    //       reasonCategory: 'glorific_trivia_of_cruel_inhuman_acts',
-    //       reasonDescription: 'murder',
-    //     },
-    //   }),
-    // ])
-    // authenticatedUser = null
-
-    // only review resource after report !!!
-    // const reviewMutation = gql`
-    //   mutation($resourceId: ID!, $disable: Boolean, $closed: Boolean) {
-    //     review(resourceId: $resourceId, disable: $disable, closed: $closed) {
-    //       disable
-    //     }
-    //   }
-    // `
-    // const disableVariables = {
-    //   resourceId: 'undefined-resource',
-    //   disable: true,
-    //   closed: false,
-    // }
-    // authenticatedUser = await bobDerBaumeister.toJson()
-    // await Promise.all([
-    //   mutate({
-    //     mutation: reviewMutation,
-    //     variables: {
-    //       ...disableVariables,
-    //       resourceId: 'p2',
-    //     },
-    //   }),
-    //   mutate({
-    //     mutation: reviewMutation,
-    //     variables: {
-    //       ...disableVariables,
-    //       resourceId: 'p11',
-    //     },
-    //   }),
-    //   mutate({
-    //     mutation: reviewMutation,
-    //     variables: {
-    //       ...disableVariables,
-    //       resourceId: 'c5',
-    //       closed: true,
-    //     },
-    //   }),
-    // ])
-    // authenticatedUser = await peterLustig.toJson()
-    // await Promise.all([
-    //   mutate({
-    //     mutation: reviewMutation,
-    //     variables: {
-    //       ...disableVariables,
-    //       resourceId: 'p2',
-    //       disable: false,
-    //       closed: true,
-    //     },
-    //   }),
-    // ])
-    // authenticatedUser = null
-
-    // report resource after closing of the report
-    // authenticatedUser = await bobDerBaumeister.toJson()
-    // await Promise.all([
-    //   mutate({
-    //     mutation: reportMutation,
-    //     variables: {
-    //       resourceId: 'p2',
-    //       reasonCategory: 'doxing',
-    //       reasonDescription: "That's my friends privat data!",
-    //     },
-    //   }),
-    // ])
-    // // report resource second time after closing of the report
-    // authenticatedUser = await jennyRostock.toJson()
-    // await Promise.all([
-    //   mutate({
-    //     mutation: reportMutation,
-    //     variables: {
-    //       resourceId: 'p2',
-    //       reasonCategory: 'doxing',
-    //       reasonDescription: 'I think it is my friends data!',
-    //     },
-    //   }),
-    // ])
-    // authenticatedUser = null
-
-    // // third review of resource and close report
-    // authenticatedUser = await bobDerBaumeister.toJson()
-    // await Promise.all([
-    //   mutate({
-    //     mutation: reviewMutation,
-    //     variables: {
-    //       ...disableVariables,
-    //       resourceId: 'p2',
-    //       disable: true,
-    //       closed: true,
-    //     },
-    //   }),
-    // ])
-    // authenticatedUser = null
-
-    // // report resource after second closing of the report
-    // authenticatedUser = await huey.toJson()
-    // await Promise.all([
-    //   mutate({
-    //     mutation: reportMutation,
-    //     variables: {
-    //       resourceId: 'p2',
-    //       reasonCategory: 'doxing',
-    //       reasonDescription: "That's my privat data!",
-    //     },
-    //   }),
-    // ])
-    // // report resource second time after second closing of the report
-    // authenticatedUser = await jennyRostock.toJson()
-    // await Promise.all([
-    //   mutate({
-    //     mutation: reportMutation,
-    //     variables: {
-    //       resourceId: 'p2',
-    //       reasonCategory: 'doxing',
-    //       reasonDescription: 'I think it is my friends data again!',
-    //     },
-    //   }),
-    // ])
-    // authenticatedUser = null
-
     await Promise.all(
       [...Array(30).keys()].map(i => {
         return factory.create('User')

From c05065f684680af66561a485afd7b10e54d338bd Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Mon, 2 Dec 2019 13:38:35 +0100
Subject: [PATCH 134/174] Refactor backend

- update script
- use readTxResult for validateReview
- favor more verbose variables
- do not set review.closed as we close the report and the rule at the
moment is set to 'latestReviewUpdatedAtRules' rule, so it's clear the
last review must have been the one that closed the report
---
 .../validation/validationMiddleware.js        | 65 ++++++++++---------
 backend/src/schema/resolvers/moderation.js    |  4 +-
 backend/src/schema/resolvers/reports.js       |  4 +-
 ...ge_disabled_relationship_to_report_node.sh | 55 ++++++++++++++++
 4 files changed, 95 insertions(+), 33 deletions(-)
 create mode 100755 neo4j/change_disabled_relationship_to_report_node.sh

diff --git a/backend/src/middleware/validation/validationMiddleware.js b/backend/src/middleware/validation/validationMiddleware.js
index b8c539a0f..4dcfb6ed4 100644
--- a/backend/src/middleware/validation/validationMiddleware.js
+++ b/backend/src/middleware/validation/validationMiddleware.js
@@ -66,43 +66,50 @@ const validateReport = async (resolve, root, args, context, info) => {
 
 const validateReview = async (resolve, root, args, context, info) => {
   const { resourceId } = args
+  let existingReportedResource
   const { user, driver } = context
   if (resourceId === user.id) throw new Error('You cannot review yourself!')
   const session = driver.session()
-  const reportQueryRes = await session.run(
-    `
-      MATCH (resource {id: $resourceId})
-      WHERE resource:User OR resource:Post OR resource:Comment
-      OPTIONAL MATCH (:User)-[filed:FILED]->(:Report {closed: false})-[:BELONGS_TO]->(resource)
-      OPTIONAL MATCH (resource)<-[:WROTE]-(author:User)
-      RETURN labels(resource)[0] AS label, author, filed
-    `,
-    {
-      resourceId,
-      submitterId: user.id,
-    },
-  )
-  session.close()
-  const [existingReportedResource] = reportQueryRes.records.map(record => {
-    return {
+  const reportReadTxPromise = session.writeTransaction(async txc => {
+    const validateReviewTransactionResponse = await txc.run(
+      `
+        MATCH (resource {id: $resourceId})
+        WHERE resource:User OR resource:Post OR resource:Comment
+        OPTIONAL MATCH (:User)-[filed:FILED]->(:Report {closed: false})-[:BELONGS_TO]->(resource)
+        OPTIONAL MATCH (resource)<-[:WROTE]-(author:User)
+        RETURN labels(resource)[0] AS label, author, filed
+      `,
+      {
+        resourceId,
+        submitterId: user.id,
+      },
+    )
+    return validateReviewTransactionResponse.records.map(record => ({
       label: record.get('label'),
       author: record.get('author'),
       filed: record.get('filed'),
-    }
+    }))
   })
+  try {
+    const txResult = await reportReadTxPromise
+    existingReportedResource = txResult
+    if (!existingReportedResource || !existingReportedResource.length)
+      throw new Error(`Resource not found or is not a Post|Comment|User!`)
+    existingReportedResource = existingReportedResource[0]
+    if (!existingReportedResource.filed)
+      throw new Error(
+        `Before starting the review process, please report the ${existingReportedResource.label}!`,
+      )
+    const authorId =
+      existingReportedResource.label !== 'User' && existingReportedResource.author
+        ? existingReportedResource.author.properties.id
+        : null
+    if (authorId && authorId === user.id)
+      throw new Error(`You cannot review your own ${existingReportedResource.label}!`)
+  } finally {
+    session.close()
+  }
 
-  if (!existingReportedResource)
-    throw new Error(`Resource not found or is not a Post|Comment|User!`)
-  if (!existingReportedResource.filed)
-    throw new Error(
-      `Before starting the review process, please report the ${existingReportedResource.label}!`,
-    )
-  const authorId =
-    existingReportedResource.label !== 'User' && existingReportedResource.author
-      ? existingReportedResource.author.properties.id
-      : null
-  if (authorId && authorId === user.id)
-    throw new Error(`You cannot review your own ${existingReportedResource.label}!`)
   return resolve(root, args, context, info)
 }
 
diff --git a/backend/src/schema/resolvers/moderation.js b/backend/src/schema/resolvers/moderation.js
index b5aed1e14..4bdf82d50 100644
--- a/backend/src/schema/resolvers/moderation.js
+++ b/backend/src/schema/resolvers/moderation.js
@@ -24,8 +24,8 @@ export default {
             MERGE (report)<-[review:REVIEWED]-(moderator)
             ON CREATE SET review.createdAt = $dateTime, review.updatedAt = review.createdAt
             ON MATCH SET review.updatedAt = $dateTime
-            SET review.disable = $params.disable, review.closed = $params.closed
-            SET report.updatedAt = $dateTime, report.closed = review.closed
+            SET review.disable = $params.disable
+            SET report.updatedAt = $dateTime, report.closed = $params.closed
             SET resource.disabled = review.disable
 
             RETURN review, report, resource, labels(resource)[0] AS type
diff --git a/backend/src/schema/resolvers/reports.js b/backend/src/schema/resolvers/reports.js
index c3ac3caac..fc93229ae 100644
--- a/backend/src/schema/resolvers/reports.js
+++ b/backend/src/schema/resolvers/reports.js
@@ -63,7 +63,7 @@ export default {
         default:
           orderByClause = ''
       }
-      const readTxPromise = session.readTransaction(async tx => {
+      const reportReadTxPromise = session.readTransaction(async tx => {
         const allReportsTransactionResponse = await tx.run(
           `
           MATCH (submitter:User)-[filed:FILED]->(report:Report)-[:BELONGS_TO]->(resource)
@@ -76,7 +76,7 @@ export default {
         return allReportsTransactionResponse.records.map(transformReturnType)
       })
       try {
-        const txResult = await readTxPromise
+        const txResult = await reportReadTxPromise
         if (!txResult[0]) return null
         reports = txResult
       } finally {
diff --git a/neo4j/change_disabled_relationship_to_report_node.sh b/neo4j/change_disabled_relationship_to_report_node.sh
new file mode 100755
index 000000000..55dd1333c
--- /dev/null
+++ b/neo4j/change_disabled_relationship_to_report_node.sh
@@ -0,0 +1,55 @@
+#!/usr/bin/env bash
+
+ENV_FILE=$(dirname "$0")/.env
+[[ -f "$ENV_FILE" ]] && source "$ENV_FILE"
+
+if [ -z "$NEO4J_USERNAME" ] || [ -z "$NEO4J_PASSWORD" ]; then
+  echo "Please set NEO4J_USERNAME and NEO4J_PASSWORD environment variables."
+  echo "Database manipulation is not possible without connecting to the database."
+  echo "E.g. you could \`cp .env.template .env\` unless you run the script in a docker container"
+fi
+
+until echo 'RETURN "Connection successful" as info;' | cypher-shell
+do
+  echo "Connecting to neo4j failed, trying again..."
+  sleep 1
+done
+
+echo "
+// convert old DISABLED to new REVIEWED-Report-BELONGS_TO structure
+MATCH (moderator:User)-[disabled:DISABLED]->(disabledResource)
+WHERE disabledResource:User OR disabledResource:Comment OR disabledResource:Post
+DELETE disabled
+CREATE (moderator)-[review:REVIEWED]->(report:Report)-[:BELONGS_TO]->(disabledResource)
+SET review.createdAt = toString(datetime()), review.updatedAt = review.createdAt, review.disable = true
+SET report.id = randomUUID(), report.createdAt = toString(datetime()), report.updatedAt = report.createdAt, report.rule = 'latestReviewUpdatedAtRules', report.closed = false
+
+// if disabledResource has no filed report, then create a moderators default filed report
+WITH moderator, disabledResource, report
+OPTIONAL MATCH (disabledResourceReporter:User)-[existingFiledReport:FILED]->(disabledResource)
+FOREACH(disabledResource IN CASE WHEN existingFiledReport IS NULL THEN [1] ELSE [] END | 
+  CREATE (moderator)-[addModeratorReport:FILED]->(report)
+  SET addModeratorReport.createdAt = toString(datetime()), addModeratorReport.reasonCategory = 'other', addModeratorReport.reasonDescription = 'Old DISABLED relation had no now mandatory report !!! Created automatically to ensure database consistency! Creation date is when the database manipulation happened.'
+)
+FOREACH(disabledResource IN CASE WHEN existingFiledReport IS NOT NULL THEN [1] ELSE [] END | 
+  CREATE (disabledResourceReporter)-[moveModeratorReport:FILED]->(report)
+  SET moveModeratorReport = existingFiledReport
+  DELETE existingFiledReport
+)
+
+RETURN disabledResource {.id};
+" | cypher-shell
+
+echo "
+// for FILED resources without DISABLED relation which are handled above, create new FILED-Report-BELONGS_TO structure
+MATCH (reporter:User)-[oldReport:REPORTED]->(notDisabledResource)
+WHERE notDisabledResource:User OR notDisabledResource:Comment OR notDisabledResource:Post
+MERGE (report:Report)-[:BELONGS_TO]->(notDisabledResource)
+ON CREATE SET report.id = randomUUID(), report.createdAt = toString(datetime()), report.updatedAt = report.createdAt, report.rule = 'latestReviewUpdatedAtRules', report.closed = false
+CREATE (reporter)-[filed:FILED]->(report)
+SET report = oldReport
+DELETE oldReport
+
+RETURN notDisabledResource {.id};
+" | cypher-shell
+

From e4aba5d4df91c20d04248cf428256fb952eacd5e Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Mon, 2 Dec 2019 13:56:44 +0100
Subject: [PATCH 135/174] Add test case/Fix message

- Test that the rule is automatically created for new reviews
- Improve English message
---
 backend/src/schema/resolvers/reports.spec.js      | 15 +++++++++++++++
 ...change_disabled_relationship_to_report_node.sh |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/backend/src/schema/resolvers/reports.spec.js b/backend/src/schema/resolvers/reports.spec.js
index 648f55688..e4fb32ec8 100644
--- a/backend/src/schema/resolvers/reports.spec.js
+++ b/backend/src/schema/resolvers/reports.spec.js
@@ -23,6 +23,7 @@ describe('file a report on a resource', () => {
         updatedAt
         disable
         closed
+        rule
         resource {
           __typename
           ... on User {
@@ -151,6 +152,20 @@ describe('file a report on a resource', () => {
             expect(firstReport.data.fileReport.id).toEqual(secondReport.data.fileReport.id)
           })
 
+          it('returns the rule for how the report was decided', async () => {
+            await expect(mutate({
+              mutation: reportMutation,
+              variables: { ...variables, resourceId: 'abusive-user-id' },
+            }),
+            ).resolves.toMatchObject({
+              data: {
+                fileReport: {
+                  rule: 'latestReviewUpdatedAtRules'
+                },
+              },
+              errors: undefined,
+            })
+          })
           it.todo('creates multiple filed reports')
         })
 
diff --git a/neo4j/change_disabled_relationship_to_report_node.sh b/neo4j/change_disabled_relationship_to_report_node.sh
index 55dd1333c..2f44b8e59 100755
--- a/neo4j/change_disabled_relationship_to_report_node.sh
+++ b/neo4j/change_disabled_relationship_to_report_node.sh
@@ -29,7 +29,7 @@ WITH moderator, disabledResource, report
 OPTIONAL MATCH (disabledResourceReporter:User)-[existingFiledReport:FILED]->(disabledResource)
 FOREACH(disabledResource IN CASE WHEN existingFiledReport IS NULL THEN [1] ELSE [] END | 
   CREATE (moderator)-[addModeratorReport:FILED]->(report)
-  SET addModeratorReport.createdAt = toString(datetime()), addModeratorReport.reasonCategory = 'other', addModeratorReport.reasonDescription = 'Old DISABLED relation had no now mandatory report !!! Created automatically to ensure database consistency! Creation date is when the database manipulation happened.'
+  SET addModeratorReport.createdAt = toString(datetime()), addModeratorReport.reasonCategory = 'other', addModeratorReport.reasonDescription = 'Old DISABLED relations didn't enforce mandatory reporting !!! Created automatically to ensure database consistency! Creation date is when the database manipulation happened.'
 )
 FOREACH(disabledResource IN CASE WHEN existingFiledReport IS NOT NULL THEN [1] ELSE [] END | 
   CREATE (disabledResourceReporter)-[moveModeratorReport:FILED]->(report)

From 58e7f4164d4bbfb45cf048572adaab7dcd02e72c Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Mon, 2 Dec 2019 15:10:09 +0100
Subject: [PATCH 136/174] Fix German translation of "Shouts"

Requested by @DennisHack

@Mogge are you "moriz" on our discord who keeps track of translations?
This might be interesting for you, too.
---
 webapp/locales/de.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index a87cbd28a..9f1f2d928 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -184,7 +184,7 @@
             "projects": "Projekte",
             "invites": "Einladungen",
             "follows": "Folgen",
-            "shouts": "Zurufe"
+            "shouts": "Empfehlungen"
         },
         "organizations": {
             "name": "Organisationen"

From 4ac3f92989f7704844ed72f6793699cc3632f7a7 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Mon, 2 Dec 2019 15:54:51 +0100
Subject: [PATCH 137/174] Fix lint

---
 backend/src/schema/resolvers/reports.spec.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/backend/src/schema/resolvers/reports.spec.js b/backend/src/schema/resolvers/reports.spec.js
index e4fb32ec8..c0a9d3afb 100644
--- a/backend/src/schema/resolvers/reports.spec.js
+++ b/backend/src/schema/resolvers/reports.spec.js
@@ -153,14 +153,15 @@ describe('file a report on a resource', () => {
           })
 
           it('returns the rule for how the report was decided', async () => {
-            await expect(mutate({
-              mutation: reportMutation,
-              variables: { ...variables, resourceId: 'abusive-user-id' },
-            }),
+            await expect(
+              mutate({
+                mutation: reportMutation,
+                variables: { ...variables, resourceId: 'abusive-user-id' },
+              }),
             ).resolves.toMatchObject({
               data: {
                 fileReport: {
-                  rule: 'latestReviewUpdatedAtRules'
+                  rule: 'latestReviewUpdatedAtRules',
                 },
               },
               errors: undefined,

From 8d4757d77195d48e6d8a39a546556f5618a12626 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 2 Dec 2019 15:00:23 +0000
Subject: [PATCH 138/174] build(deps-dev): bump eslint from 6.7.1 to 6.7.2 in
 /webapp

Bumps [eslint](https://github.com/eslint/eslint) from 6.7.1 to 6.7.2.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v6.7.1...v6.7.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 webapp/package.json | 2 +-
 webapp/yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/webapp/package.json b/webapp/package.json
index c5d973b68..5562761cb 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -117,7 +117,7 @@
     "babel-preset-vue": "~2.0.2",
     "core-js": "~2.6.10",
     "css-loader": "~3.2.0",
-    "eslint": "~6.7.1",
+    "eslint": "~6.7.2",
     "eslint-config-prettier": "~6.7.0",
     "eslint-config-standard": "~14.1.0",
     "eslint-loader": "~3.0.2",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index 2bed3329f..ebed948bf 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -7286,10 +7286,10 @@ eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2"
   integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==
 
-eslint@~6.7.1:
-  version "6.7.1"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.7.1.tgz#269ccccec3ef60ab32358a44d147ac209154b919"
-  integrity sha512-UWzBS79pNcsDSxgxbdjkmzn/B6BhsXMfUaOHnNwyE8nD+Q6pyT96ow2MccVayUTV4yMid4qLhMiQaywctRkBLA==
+eslint@~6.7.2:
+  version "6.7.2"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.7.2.tgz#c17707ca4ad7b2d8af986a33feba71e18a9fecd1"
+  integrity sha512-qMlSWJaCSxDFr8fBPvJM9kJwbazrhNcBU3+DszDW1OlEwKBBRWsJc7NJFelvwQpanHCR14cOLD41x8Eqvo3Nng==
   dependencies:
     "@babel/code-frame" "^7.0.0"
     ajv "^6.10.0"

From 7c6d5b5129f75b0540c29fce1c0f6e51fc704638 Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Fri, 22 Nov 2019 23:14:00 +0100
Subject: [PATCH 139/174] fix: Re-enable webfinger feature

Ok, so here is the plan. Let's give both our cucumber features and your
cypress tests a prominent place to live. That would be the root level
folder of our application. Second, let's revive formerly dead code step
by step.

Ie. move code from the former location `backend/features/` to `features/`
when it is ready. All edge cases should be tested with unit tests in
`backend/`, see my `webfinger.spec.js` as an example.
---
 .travis.yml                                   |    9 +-
 babel.config.json                             |   12 +
 backend/{.babelrc => babel.config.json}       |    0
 backend/package.json                          |    2 -
 backend/src/activitypub/routes/index.js       |   44 +-
 backend/src/activitypub/routes/webFinger.js   |   43 -
 backend/src/activitypub/routes/webfinger.js   |   59 +
 .../src/activitypub/routes/webfinger.spec.js  |  117 ++
 backend/src/activitypub/utils/actor.js        |   14 -
 backend/src/config/index.js                   |    3 +-
 backend/src/server.js                         |    4 +
 backend/test/features/webfinger.feature       |   26 -
 deployment/minikube/README.md                 |    2 +-
 features/support/steps.js                     |   45 +
 features/webfinger.feature                    |   36 +
 features/world.js                             |   38 +
 package.json                                  |   11 +-
 yarn.lock                                     | 1075 ++++++++++++++++-
 18 files changed, 1418 insertions(+), 122 deletions(-)
 create mode 100644 babel.config.json
 rename backend/{.babelrc => babel.config.json} (100%)
 delete mode 100644 backend/src/activitypub/routes/webFinger.js
 create mode 100644 backend/src/activitypub/routes/webfinger.js
 create mode 100644 backend/src/activitypub/routes/webfinger.spec.js
 create mode 100644 features/support/steps.js
 create mode 100644 features/webfinger.feature
 create mode 100644 features/world.js

diff --git a/.travis.yml b/.travis.yml
index 1cc36fca4..a2aae3cdb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,13 +8,13 @@ addons:
     - docker
     - chromium
 
-before_install:
+install:
   - yarn global add wait-on
   # Install Codecov
   - yarn install
   - cp cypress.env.template.json cypress.env.json
 
-install:
+before_script:
   - docker-compose -f docker-compose.yml build --parallel
   - docker-compose -f docker-compose.yml -f docker-compose.build-and-test.yml build # just tagging, just be quite fast
   - docker-compose -f docker-compose.yml -f docker-compose.build-and-test.yml up -d
@@ -30,10 +30,6 @@ script:
   - docker-compose exec backend yarn run test --ci --verbose=false --coverage
   - docker-compose exec backend yarn run db:seed
   - docker-compose exec backend yarn run db:reset
-  # ActivityPub cucumber testing temporarily disabled because it's too buggy
-  # - docker-compose exec backend yarn run test:cucumber --tags "not @wip"
-  # - docker-compose exec backend yarn run db:reset
-  # - docker-compose exec backend yarn run db:seed
   # Frontend
   - docker-compose exec webapp yarn run lint
   - docker-compose exec webapp yarn run test --ci --verbose=false --coverage
@@ -42,6 +38,7 @@ script:
   - docker-compose -f docker-compose.yml up -d
   - wait-on http://localhost:7474
   - yarn run cypress:run --record
+  - yarn run cucumber
   # Coverage
   - yarn run codecov
 
diff --git a/babel.config.json b/babel.config.json
new file mode 100644
index 000000000..2d91b3635
--- /dev/null
+++ b/babel.config.json
@@ -0,0 +1,12 @@
+{
+  "presets": [
+    [
+      "@babel/preset-env",
+      {
+        "targets": {
+          "node": "10"
+        }
+      }
+    ]
+  ]
+}
diff --git a/backend/.babelrc b/backend/babel.config.json
similarity index 100%
rename from backend/.babelrc
rename to backend/babel.config.json
diff --git a/backend/package.json b/backend/package.json
index 5016d7c9f..f641c528c 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -10,8 +10,6 @@
     "dev:debug": "nodemon --exec babel-node --inspect=0.0.0.0:9229 src/index.js -e js,gql",
     "lint": "eslint src --config .eslintrc.js",
     "test": "jest --forceExit --detectOpenHandles --runInBand",
-    "test:cucumber:cmd": "wait-on tcp:4001 tcp:4123 && cucumber-js --require-module @babel/register --exit test/",
-    "test:cucumber": " cross-env CLIENT_URI=http://localhost:4123 run-p --race test:before:* 'test:cucumber:cmd {@}' --",
     "db:reset": "babel-node src/seed/reset-db.js",
     "db:seed": "babel-node src/seed/seed-db.js"
   },
diff --git a/backend/src/activitypub/routes/index.js b/backend/src/activitypub/routes/index.js
index c7d31f1c4..fb4037004 100644
--- a/backend/src/activitypub/routes/index.js
+++ b/backend/src/activitypub/routes/index.js
@@ -1,27 +1,29 @@
 import user from './user'
 import inbox from './inbox'
-import webFinger from './webFinger'
 import express from 'express'
 import cors from 'cors'
 import verify from './verify'
 
-const router = express.Router()
-
-router.use('/.well-known/webFinger', cors(), express.urlencoded({ extended: true }), webFinger)
-router.use(
-  '/activitypub/users',
-  cors(),
-  express.json({ type: ['application/activity+json', 'application/ld+json', 'application/json'] }),
-  express.urlencoded({ extended: true }),
-  user,
-)
-router.use(
-  '/activitypub/inbox',
-  cors(),
-  express.json({ type: ['application/activity+json', 'application/ld+json', 'application/json'] }),
-  express.urlencoded({ extended: true }),
-  verify,
-  inbox,
-)
-
-export default router
+export default function() {
+  const router = express.Router()
+  router.use(
+    '/activitypub/users',
+    cors(),
+    express.json({
+      type: ['application/activity+json', 'application/ld+json', 'application/json'],
+    }),
+    express.urlencoded({ extended: true }),
+    user,
+  )
+  router.use(
+    '/activitypub/inbox',
+    cors(),
+    express.json({
+      type: ['application/activity+json', 'application/ld+json', 'application/json'],
+    }),
+    express.urlencoded({ extended: true }),
+    verify,
+    inbox,
+  )
+  return router
+}
diff --git a/backend/src/activitypub/routes/webFinger.js b/backend/src/activitypub/routes/webFinger.js
deleted file mode 100644
index 7d52c69cd..000000000
--- a/backend/src/activitypub/routes/webFinger.js
+++ /dev/null
@@ -1,43 +0,0 @@
-import express from 'express'
-import { createWebFinger } from '../utils/actor'
-import gql from 'graphql-tag'
-
-const router = express.Router()
-
-router.get('/', async function(req, res) {
-  const resource = req.query.resource
-  if (!resource || !resource.includes('acct:')) {
-    return res
-      .status(400)
-      .send(
-        'Bad request. Please make sure "acct:USER@DOMAIN" is what you are sending as the "resource" query parameter.',
-      )
-  } else {
-    const nameAndDomain = resource.replace('acct:', '')
-    const name = nameAndDomain.split('@')[0]
-
-    let result
-    try {
-      result = await req.app.get('ap').dataSource.client.query({
-        query: gql`
-        query {
-          User(slug: "${name}") {
-            slug
-          }
-        }
-      `,
-      })
-    } catch (error) {
-      return res.status(500).json({ error })
-    }
-
-    if (result.data && result.data.User.length > 0) {
-      const webFinger = createWebFinger(name)
-      return res.contentType('application/jrd+json').json(webFinger)
-    } else {
-      return res.status(404).json({ error: `No record found for ${nameAndDomain}.` })
-    }
-  }
-})
-
-export default router
diff --git a/backend/src/activitypub/routes/webfinger.js b/backend/src/activitypub/routes/webfinger.js
new file mode 100644
index 000000000..c2cb96a6d
--- /dev/null
+++ b/backend/src/activitypub/routes/webfinger.js
@@ -0,0 +1,59 @@
+import express from 'express'
+import CONFIG from '../../config/'
+import cors from 'cors'
+
+const debug = require('debug')('ea:webfinger')
+const regex = /acct:([a-z0-9_-]*)@([a-z0-9_-]*)/
+
+const createWebFinger = name => {
+  const { host } = new URL(CONFIG.CLIENT_URI)
+  return {
+    subject: `acct:${name}@${host}`,
+    links: [
+      {
+        rel: 'self',
+        type: 'application/activity+json',
+        href: `${CONFIG.CLIENT_URI}/activitypub/users/${name}`,
+      },
+    ],
+  }
+}
+
+export async function handler(req, res) {
+  const { resource = '' } = req.query
+  // eslint-disable-next-line no-unused-vars
+  const [_, name, domain] = resource.match(regex) || []
+  if (!(name && domain))
+    return res.status(400).json({
+      error: 'Query parameter "?resource=acct:<USER>@<DOMAIN>" is missing.',
+    })
+
+  const session = req.app.get('driver').session()
+  try {
+    const [slug] = await session.readTransaction(async t => {
+      const result = await t.run('MATCH (u:User {slug: $slug}) RETURN u.slug AS slug', {
+        slug: name,
+      })
+      return result.records.map(record => record.get('slug'))
+    })
+    if (!slug)
+      return res.status(404).json({
+        error: `No record found for "${name}@${domain}".`,
+      })
+    const webFinger = createWebFinger(name)
+    return res.contentType('application/jrd+json').json(webFinger)
+  } catch (error) {
+    debug(error)
+    return res.status(500).json({
+      error: 'Something went terribly wrong. Please contact support@human-connection.org',
+    })
+  } finally {
+    session.close()
+  }
+}
+
+export default function() {
+  const router = express.Router()
+  router.use('/webfinger', cors(), express.urlencoded({ extended: true }), handler)
+  return router
+}
diff --git a/backend/src/activitypub/routes/webfinger.spec.js b/backend/src/activitypub/routes/webfinger.spec.js
new file mode 100644
index 000000000..d78b77e4d
--- /dev/null
+++ b/backend/src/activitypub/routes/webfinger.spec.js
@@ -0,0 +1,117 @@
+import { handler } from './webfinger'
+import Factory from '../../seed/factories'
+import { getDriver } from '../../bootstrap/neo4j'
+
+let resource
+let res
+let json
+let status
+let contentType
+
+const factory = Factory()
+const driver = getDriver()
+
+const request = () => {
+  json = jest.fn()
+  status = jest.fn(() => ({ json }))
+  contentType = jest.fn(() => ({ json }))
+  res = { status, contentType }
+  const req = {
+    app: {
+      get: key => {
+        return {
+          driver,
+        }[key]
+      },
+    },
+    query: {
+      resource,
+    },
+  }
+  return handler(req, res)
+}
+
+afterEach(async () => {
+  await factory.cleanDatabase()
+})
+
+describe('webfinger', () => {
+  describe('no ressource', () => {
+    beforeEach(() => {
+      resource = undefined
+    })
+
+    it('sends HTTP 400', async () => {
+      await request()
+      expect(status).toHaveBeenCalledWith(400)
+      expect(json).toHaveBeenCalledWith({
+        error: 'Query parameter "?resource=acct:<USER>@<DOMAIN>" is missing.',
+      })
+    })
+  })
+
+  describe('?ressource query param', () => {
+    describe('is missing acct:', () => {
+      beforeEach(() => {
+        resource = 'some-user@domain'
+      })
+
+      it('sends HTTP 400', async () => {
+        await request()
+        expect(status).toHaveBeenCalledWith(400)
+        expect(json).toHaveBeenCalledWith({
+          error: 'Query parameter "?resource=acct:<USER>@<DOMAIN>" is missing.',
+        })
+      })
+    })
+
+    describe('has no domain', () => {
+      beforeEach(() => {
+        resource = 'acct:some-user@'
+      })
+
+      it('sends HTTP 400', async () => {
+        await request()
+        expect(status).toHaveBeenCalledWith(400)
+        expect(json).toHaveBeenCalledWith({
+          error: 'Query parameter "?resource=acct:<USER>@<DOMAIN>" is missing.',
+        })
+      })
+    })
+
+    describe('with acct:', () => {
+      beforeEach(() => {
+        resource = 'acct:some-user@domain'
+      })
+
+      it('returns empty json', async () => {
+        await request()
+        expect(status).toHaveBeenCalledWith(404)
+        expect(json).toHaveBeenCalledWith({
+          error: 'No record found for "some-user@domain".',
+        })
+      })
+
+      describe('given a user for acct', () => {
+        beforeEach(async () => {
+          await factory.create('User', { slug: 'some-user' })
+        })
+
+        it('returns user object', async () => {
+          await request()
+          expect(contentType).toHaveBeenCalledWith('application/jrd+json')
+          expect(json).toHaveBeenCalledWith({
+            links: [
+              {
+                href: 'http://localhost:3000/activitypub/users/some-user',
+                rel: 'self',
+                type: 'application/activity+json',
+              },
+            ],
+            subject: 'acct:some-user@localhost:3000',
+          })
+        })
+      })
+    })
+  })
+})
diff --git a/backend/src/activitypub/utils/actor.js b/backend/src/activitypub/utils/actor.js
index a08065778..e07397bdc 100644
--- a/backend/src/activitypub/utils/actor.js
+++ b/backend/src/activitypub/utils/actor.js
@@ -22,17 +22,3 @@ export function createActor(name, pubkey) {
     },
   }
 }
-
-export function createWebFinger(name) {
-  const { host } = new URL(activityPub.endpoint)
-  return {
-    subject: `acct:${name}@${host}`,
-    links: [
-      {
-        rel: 'self',
-        type: 'application/activity+json',
-        href: `${activityPub.endpoint}/activitypub/users/${name}`,
-      },
-    ],
-  }
-}
diff --git a/backend/src/config/index.js b/backend/src/config/index.js
index b67cea0f9..80573e180 100644
--- a/backend/src/config/index.js
+++ b/backend/src/config/index.js
@@ -1,6 +1,7 @@
 import dotenv from 'dotenv'
+import path from 'path'
 
-dotenv.config()
+dotenv.config({ path: path.resolve(__dirname, '../../.env') })
 
 const {
   MAPBOX_TOKEN,
diff --git a/backend/src/server.js b/backend/src/server.js
index 70eae86f1..053a3e4b3 100644
--- a/backend/src/server.js
+++ b/backend/src/server.js
@@ -6,6 +6,7 @@ import middleware from './middleware'
 import { neode as getNeode, getDriver } from './bootstrap/neo4j'
 import decode from './jwt/decode'
 import schema from './schema'
+import webfinger from './activitypub/routes/webfinger'
 
 // check required configs and throw error
 // TODO check this directly in config file - currently not possible due to testsetup
@@ -41,7 +42,10 @@ const createServer = options => {
   const server = new ApolloServer(Object.assign({}, defaults, options))
 
   const app = express()
+
+  app.set('driver', driver)
   app.use(helmet())
+  app.use('/.well-known/', webfinger())
   app.use(express.static('public'))
   server.applyMiddleware({ app, path: '/' })
 
diff --git a/backend/test/features/webfinger.feature b/backend/test/features/webfinger.feature
index 72062839a..cbca5ac10 100644
--- a/backend/test/features/webfinger.feature
+++ b/backend/test/features/webfinger.feature
@@ -9,32 +9,6 @@ Feature: Webfinger discovery
       | Slug           |
       | peter-lustiger |
 
-  Scenario: Search
-    When I send a GET request to "/.well-known/webfinger?resource=acct:peter-lustiger@localhost"
-    Then I receive the following json:
-    """
-    {
-      "subject": "acct:peter-lustiger@localhost:4123",
-      "links": [
-        {
-          "rel": "self",
-          "type": "application/activity+json",
-          "href": "http://localhost:4123/activitypub/users/peter-lustiger"
-        }
-      ]
-    }
-    """
-    And I expect the Content-Type to be "application/jrd+json; charset=utf-8"
-
-  Scenario: User does not exist
-    When I send a GET request to "/.well-known/webfinger?resource=acct:nonexisting@localhost"
-    Then I receive the following json:
-    """
-    {
-      "error": "No record found for nonexisting@localhost."
-    }
-    """
-
   Scenario: Receiving an actor object
     When I send a GET request to "/activitypub/users/peter-lustiger"
     Then I receive the following json:
diff --git a/deployment/minikube/README.md b/deployment/minikube/README.md
index e77ddd667..342675b1b 100644
--- a/deployment/minikube/README.md
+++ b/deployment/minikube/README.md
@@ -9,7 +9,7 @@ open your minikube dashboard:
 $ minikube dashboard
 ```
 
-This will give you an overview. Some of the steps below need some timing to make ressources available to other dependent deployments. Keeping an eye on the dashboard is a great way to check that.
+This will give you an overview. Some of the steps below need some timing to make resources available to other dependent deployments. Keeping an eye on the dashboard is a great way to check that.
 
 Follow the installation instruction for [Human Connection](../human-connection/README.md).
 If all the pods and services have settled and everything looks green in your
diff --git a/features/support/steps.js b/features/support/steps.js
new file mode 100644
index 000000000..a8ea23234
--- /dev/null
+++ b/features/support/steps.js
@@ -0,0 +1,45 @@
+// features/support/steps.js
+import { Given, When, Then, After, AfterAll } from 'cucumber'
+import Factory from '../../backend/src/seed/factories'
+import dotenv from 'dotenv'
+import expect from 'expect'
+
+const debug = require('debug')('ea:test:steps')
+const factory = Factory()
+
+
+After(async () => {
+  await factory.cleanDatabase()
+})
+
+Given('our CLIENT_URI is {string}', function (string) {
+  expect(process.env.CLIENT_URI).toEqual(string)
+});
+
+Given('we have the following users in our database:', function (dataTable) {
+  return Promise.all(dataTable.hashes().map(({ slug, name }) => {
+    return factory.create('User', {
+      name,
+      slug,
+    })
+  }))
+})
+
+When('I send a GET request to {string}', async function (pathname) {
+  const response = await this.get(pathname)
+  this.lastContentType = response.lastContentType
+
+  this.lastResponses.push(response.lastResponse)
+  this.statusCode = response.statusCode
+})
+
+Then('the server responds with a HTTP Status {int} and the following json:', function (statusCode, docString) {
+  expect(this.statusCode).toEqual(statusCode)
+  const [ lastResponse ] = this.lastResponses
+  expect(JSON.parse(lastResponse)).toMatchObject(JSON.parse(docString))
+})
+
+Then('the Content-Type is {string}', function (contentType) {
+  expect(this.lastContentType).toEqual(contentType)
+})
+
diff --git a/features/webfinger.feature b/features/webfinger.feature
new file mode 100644
index 000000000..1a17e7ea3
--- /dev/null
+++ b/features/webfinger.feature
@@ -0,0 +1,36 @@
+Feature: Webfinger discovery
+  From an external server, e.g. Mastodon
+  I want to search for an actor alias
+  In order to follow the actor
+
+  Background:
+    Given our CLIENT_URI is "http://localhost:3000"
+    And we have the following users in our database:
+      | name           | slug           |
+      | Peter Lustiger | peter-lustiger |
+
+  Scenario: Search a user
+    When I send a GET request to "/.well-known/webfinger?resource=acct:peter-lustiger@localhost"
+    Then the server responds with a HTTP Status 200 and the following json:
+    """
+    {
+      "subject": "acct:peter-lustiger@localhost:3000",
+      "links": [
+        {
+          "rel": "self",
+          "type": "application/activity+json",
+          "href": "http://localhost:3000/activitypub/users/peter-lustiger"
+        }
+      ]
+    }
+    """
+    And the Content-Type is "application/jrd+json; charset=utf-8"
+
+  Scenario: Search without result
+    When I send a GET request to "/.well-known/webfinger?resource=acct:nonexisting@localhost"
+    Then the server responds with a HTTP Status 404 and the following json:
+    """
+    {
+      "error": "No record found for \"nonexisting@localhost\"."
+    }
+    """
diff --git a/features/world.js b/features/world.js
new file mode 100644
index 000000000..f46a63d4e
--- /dev/null
+++ b/features/world.js
@@ -0,0 +1,38 @@
+import { setWorldConstructor } from 'cucumber'
+import request from 'request'
+
+class CustomWorld {
+  constructor () {
+    // webFinger.feature
+    this.lastResponses = []
+    this.lastContentType = null
+    this.lastInboxUrl = null
+    this.lastActivity = null
+    // object-article.feature
+    this.statusCode = null
+  }
+  get (pathname) {
+    return new Promise((resolve, reject) => {
+      request(`http://localhost:4000/${this.replaceSlashes(pathname)}`, {
+        headers: {
+          'Accept': 'application/activity+json'
+        }}, (error, response, body) => {
+        if (!error) {
+          resolve({
+            lastResponse: body,
+            lastContentType: response.headers['content-type'],
+            statusCode: response.statusCode
+          })
+        } else {
+          reject(error)
+        }
+      })
+    })
+  }
+
+  replaceSlashes (pathname) {
+    return pathname.replace(/^\/+/, '')
+  }
+}
+
+setWorldConstructor(CustomWorld)
diff --git a/package.json b/package.json
index 2c1793041..ac7e575df 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
-  "name": "nitro-cypress",
+  "name": "human-connection",
   "version": "0.1.11",
-  "description": "Fullstack tests with cypress for Human Connection",
+  "description": "Fullstack and API tests with cypress and cucumber for Human Connection",
   "author": "Human Connection gGmbh",
   "license": "MIT",
   "cypress-cucumber-preprocessor": {
@@ -16,19 +16,26 @@
     "cypress:setup": "run-p cypress:backend cypress:webapp",
     "cypress:run": "cross-env cypress run --browser chromium",
     "cypress:open": "cross-env cypress open --browser chromium",
+    "cucumber:setup": "cd backend && yarn run dev",
+    "cucumber": "wait-on tcp:4000 && cucumber-js --require-module @babel/register --exit",
     "version": "auto-changelog -p"
   },
   "devDependencies": {
+    "@babel/core": "^7.7.2",
+    "@babel/preset-env": "^7.7.4",
+    "@babel/register": "^7.7.4",
     "auto-changelog": "^1.16.2",
     "bcryptjs": "^2.4.3",
     "codecov": "^3.6.1",
     "cross-env": "^6.0.3",
+    "cucumber": "^6.0.5",
     "cypress": "^3.7.0",
     "cypress-cucumber-preprocessor": "^1.17.0",
     "cypress-file-upload": "^3.5.0",
     "cypress-plugin-retries": "^1.5.0",
     "date-fns": "^2.8.1",
     "dotenv": "^8.2.0",
+    "expect": "^24.9.0",
     "faker": "Marak/faker.js#master",
     "graphql-request": "^1.8.2",
     "neo4j-driver": "^1.7.6",
diff --git a/yarn.lock b/yarn.lock
index 29edc575a..32999aded 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -36,6 +36,26 @@
     semver "^5.4.1"
     source-map "^0.5.0"
 
+"@babel/core@^7.7.2":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.7.4.tgz#37e864532200cb6b50ee9a4045f5f817840166ab"
+  integrity sha512-+bYbx56j4nYBmpsWtnPUsKW3NdnYxbqyfrP2w9wILBuHzdfIKz9prieZK0DFPyIzkjYVUe4QkusGL07r5pXznQ==
+  dependencies:
+    "@babel/code-frame" "^7.5.5"
+    "@babel/generator" "^7.7.4"
+    "@babel/helpers" "^7.7.4"
+    "@babel/parser" "^7.7.4"
+    "@babel/template" "^7.7.4"
+    "@babel/traverse" "^7.7.4"
+    "@babel/types" "^7.7.4"
+    convert-source-map "^1.7.0"
+    debug "^4.1.0"
+    json5 "^2.1.0"
+    lodash "^4.17.13"
+    resolve "^1.3.2"
+    semver "^5.4.1"
+    source-map "^0.5.0"
+
 "@babel/generator@^7.4.0":
   version "7.4.0"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.4.0.tgz#c230e79589ae7a729fd4631b9ded4dc220418196"
@@ -58,6 +78,16 @@
     source-map "^0.5.0"
     trim-right "^1.0.1"
 
+"@babel/generator@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.7.4.tgz#db651e2840ca9aa66f327dcec1dc5f5fa9611369"
+  integrity sha512-m5qo2WgdOJeyYngKImbkyQrnUN1mPceaG5BV+G0E3gWsa4l/jCSryWJdM2x8OuGAOyh+3d5pVYfZWCiNFtynxg==
+  dependencies:
+    "@babel/types" "^7.7.4"
+    jsesc "^2.5.1"
+    lodash "^4.17.13"
+    source-map "^0.5.0"
+
 "@babel/helper-annotate-as-pure@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.0.0.tgz#323d39dd0b50e10c7c06ca7d7638e6864d8c5c32"
@@ -65,6 +95,13 @@
   dependencies:
     "@babel/types" "^7.0.0"
 
+"@babel/helper-annotate-as-pure@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.7.4.tgz#bb3faf1e74b74bd547e867e48f551fa6b098b6ce"
+  integrity sha512-2BQmQgECKzYKFPpiycoF9tlb5HA4lrVyAmLLVK177EcQAqjVLciUb2/R+n1boQ9y5ENV3uz2ZqiNw7QMBBw1Og==
+  dependencies:
+    "@babel/types" "^7.7.4"
+
 "@babel/helper-builder-binary-assignment-operator-visitor@^7.1.0":
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.1.0.tgz#6b69628dfe4087798e0c4ed98e3d4a6b2fbd2f5f"
@@ -73,6 +110,14 @@
     "@babel/helper-explode-assignable-expression" "^7.1.0"
     "@babel/types" "^7.0.0"
 
+"@babel/helper-builder-binary-assignment-operator-visitor@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.7.4.tgz#5f73f2b28580e224b5b9bd03146a4015d6217f5f"
+  integrity sha512-Biq/d/WtvfftWZ9Uf39hbPBYDUo986m5Bb4zhkeYDGUllF43D+nUe5M6Vuo6/8JDK/0YX/uBdeoQpyaNhNugZQ==
+  dependencies:
+    "@babel/helper-explode-assignable-expression" "^7.7.4"
+    "@babel/types" "^7.7.4"
+
 "@babel/helper-builder-react-jsx@^7.3.0":
   version "7.3.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.3.0.tgz#a1ac95a5d2b3e88ae5e54846bf462eeb81b318a4"
@@ -90,6 +135,15 @@
     "@babel/traverse" "^7.4.4"
     "@babel/types" "^7.4.4"
 
+"@babel/helper-call-delegate@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.7.4.tgz#621b83e596722b50c0066f9dc37d3232e461b801"
+  integrity sha512-8JH9/B7J7tCYJ2PpWVpw9JhPuEVHztagNVuQAFBVFYluRMlpG7F1CgKEgGeL6KFqcsIa92ZYVj6DSc0XwmN1ZA==
+  dependencies:
+    "@babel/helper-hoist-variables" "^7.7.4"
+    "@babel/traverse" "^7.7.4"
+    "@babel/types" "^7.7.4"
+
 "@babel/helper-create-class-features-plugin@^7.3.0":
   version "7.5.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.5.5.tgz#401f302c8ddbc0edd36f7c6b2887d8fa1122e5a4"
@@ -102,6 +156,14 @@
     "@babel/helper-replace-supers" "^7.5.5"
     "@babel/helper-split-export-declaration" "^7.4.4"
 
+"@babel/helper-create-regexp-features-plugin@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.7.4.tgz#6d5762359fd34f4da1500e4cff9955b5299aaf59"
+  integrity sha512-Mt+jBKaxL0zfOIWrfQpnfYCN7/rS6GKx6CCCfuoqVVd+17R8zNDlzVYmIi9qyb2wOk002NsmSTDymkIygDUH7A==
+  dependencies:
+    "@babel/helper-regex" "^7.4.4"
+    regexpu-core "^4.6.0"
+
 "@babel/helper-define-map@^7.5.5":
   version "7.5.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.5.5.tgz#3dec32c2046f37e09b28c93eb0b103fd2a25d369"
@@ -111,6 +173,15 @@
     "@babel/types" "^7.5.5"
     lodash "^4.17.13"
 
+"@babel/helper-define-map@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.7.4.tgz#2841bf92eb8bd9c906851546fe6b9d45e162f176"
+  integrity sha512-v5LorqOa0nVQUvAUTUF3KPastvUt/HzByXNamKQ6RdJRTV7j8rLL+WB5C/MzzWAwOomxDhYFb1wLLxHqox86lg==
+  dependencies:
+    "@babel/helper-function-name" "^7.7.4"
+    "@babel/types" "^7.7.4"
+    lodash "^4.17.13"
+
 "@babel/helper-explode-assignable-expression@^7.1.0":
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.1.0.tgz#537fa13f6f1674df745b0c00ec8fe4e99681c8f6"
@@ -119,6 +190,14 @@
     "@babel/traverse" "^7.1.0"
     "@babel/types" "^7.0.0"
 
+"@babel/helper-explode-assignable-expression@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.7.4.tgz#fa700878e008d85dc51ba43e9fb835cddfe05c84"
+  integrity sha512-2/SicuFrNSXsZNBxe5UGdLr+HZg+raWBLE9vC98bdYOKX/U6PY0mdGlYUJdtTDPSU0Lw0PNbKKDpwYHJLn2jLg==
+  dependencies:
+    "@babel/traverse" "^7.7.4"
+    "@babel/types" "^7.7.4"
+
 "@babel/helper-function-name@^7.1.0":
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz#a0ceb01685f73355d4360c1247f582bfafc8ff53"
@@ -128,6 +207,15 @@
     "@babel/template" "^7.1.0"
     "@babel/types" "^7.0.0"
 
+"@babel/helper-function-name@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.7.4.tgz#ab6e041e7135d436d8f0a3eca15de5b67a341a2e"
+  integrity sha512-AnkGIdiBhEuiwdoMnKm7jfPfqItZhgRaZfMg1XX3bS25INOnLPjPG1Ppnajh8eqgt5kPJnfqrRHqFqmjKDZLzQ==
+  dependencies:
+    "@babel/helper-get-function-arity" "^7.7.4"
+    "@babel/template" "^7.7.4"
+    "@babel/types" "^7.7.4"
+
 "@babel/helper-get-function-arity@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz#83572d4320e2a4657263734113c42868b64e49c3"
@@ -135,6 +223,13 @@
   dependencies:
     "@babel/types" "^7.0.0"
 
+"@babel/helper-get-function-arity@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.4.tgz#cb46348d2f8808e632f0ab048172130e636005f0"
+  integrity sha512-QTGKEdCkjgzgfJ3bAyRwF4yyT3pg+vDgan8DSivq1eS0gwi+KGKE5x8kRcbeFTb/673mkO5SN1IZfmCfA5o+EA==
+  dependencies:
+    "@babel/types" "^7.7.4"
+
 "@babel/helper-hoist-variables@^7.4.4":
   version "7.4.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.4.4.tgz#0298b5f25c8c09c53102d52ac4a98f773eb2850a"
@@ -142,6 +237,13 @@
   dependencies:
     "@babel/types" "^7.4.4"
 
+"@babel/helper-hoist-variables@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.7.4.tgz#612384e3d823fdfaaf9fce31550fe5d4db0f3d12"
+  integrity sha512-wQC4xyvc1Jo/FnLirL6CEgPgPCa8M74tOdjWpRhQYapz5JC7u3NYU1zCVoVAGCE3EaIP9T1A3iW0WLJ+reZlpQ==
+  dependencies:
+    "@babel/types" "^7.7.4"
+
 "@babel/helper-member-expression-to-functions@^7.5.5":
   version "7.5.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.5.5.tgz#1fb5b8ec4453a93c439ee9fe3aeea4a84b76b590"
@@ -149,6 +251,13 @@
   dependencies:
     "@babel/types" "^7.5.5"
 
+"@babel/helper-member-expression-to-functions@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.7.4.tgz#356438e2569df7321a8326644d4b790d2122cb74"
+  integrity sha512-9KcA1X2E3OjXl/ykfMMInBK+uVdfIVakVe7W7Lg3wfXUNyS3Q1HWLFRwZIjhqiCGbslummPDnmb7vIekS0C1vw==
+  dependencies:
+    "@babel/types" "^7.7.4"
+
 "@babel/helper-module-imports@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.0.0.tgz#96081b7111e486da4d2cd971ad1a4fe216cc2e3d"
@@ -156,6 +265,13 @@
   dependencies:
     "@babel/types" "^7.0.0"
 
+"@babel/helper-module-imports@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.7.4.tgz#e5a92529f8888bf319a6376abfbd1cebc491ad91"
+  integrity sha512-dGcrX6K9l8258WFjyDLJwuVKxR4XZfU0/vTUgOQYWEnRD8mgr+p4d6fCUMq/ys0h4CCt/S5JhbvtyErjWouAUQ==
+  dependencies:
+    "@babel/types" "^7.7.4"
+
 "@babel/helper-module-transforms@^7.1.0":
   version "7.2.2"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.2.2.tgz#ab2f8e8d231409f8370c883d20c335190284b963"
@@ -180,6 +296,18 @@
     "@babel/types" "^7.5.5"
     lodash "^4.17.13"
 
+"@babel/helper-module-transforms@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.7.4.tgz#8d7cdb1e1f8ea3d8c38b067345924ac4f8e0879a"
+  integrity sha512-ehGBu4mXrhs0FxAqN8tWkzF8GSIGAiEumu4ONZ/hD9M88uHcD+Yu2ttKfOCgwzoesJOJrtQh7trI5YPbRtMmnA==
+  dependencies:
+    "@babel/helper-module-imports" "^7.7.4"
+    "@babel/helper-simple-access" "^7.7.4"
+    "@babel/helper-split-export-declaration" "^7.7.4"
+    "@babel/template" "^7.7.4"
+    "@babel/types" "^7.7.4"
+    lodash "^4.17.13"
+
 "@babel/helper-optimise-call-expression@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.0.0.tgz#a2920c5702b073c15de51106200aa8cad20497d5"
@@ -187,6 +315,13 @@
   dependencies:
     "@babel/types" "^7.0.0"
 
+"@babel/helper-optimise-call-expression@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.7.4.tgz#034af31370d2995242aa4df402c3b7794b2dcdf2"
+  integrity sha512-VB7gWZ2fDkSuqW6b1AKXkJWO5NyNI3bFL/kK79/30moK57blr6NbH8xcl2XcKCwOmJosftWunZqfO84IGq3ZZg==
+  dependencies:
+    "@babel/types" "^7.7.4"
+
 "@babel/helper-plugin-utils@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0.tgz#bbb3fbee98661c569034237cc03967ba99b4f250"
@@ -217,6 +352,17 @@
     "@babel/traverse" "^7.1.0"
     "@babel/types" "^7.0.0"
 
+"@babel/helper-remap-async-to-generator@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.7.4.tgz#c68c2407350d9af0e061ed6726afb4fff16d0234"
+  integrity sha512-Sk4xmtVdM9sA/jCI80f+KS+Md+ZHIpjuqmYPk1M7F/upHou5e4ReYmExAiu6PVe65BhJPZA2CY9x9k4BqE5klw==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.7.4"
+    "@babel/helper-wrap-function" "^7.7.4"
+    "@babel/template" "^7.7.4"
+    "@babel/traverse" "^7.7.4"
+    "@babel/types" "^7.7.4"
+
 "@babel/helper-replace-supers@^7.5.5":
   version "7.5.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.5.5.tgz#f84ce43df031222d2bad068d2626cb5799c34bc2"
@@ -227,6 +373,16 @@
     "@babel/traverse" "^7.5.5"
     "@babel/types" "^7.5.5"
 
+"@babel/helper-replace-supers@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.7.4.tgz#3c881a6a6a7571275a72d82e6107126ec9e2cdd2"
+  integrity sha512-pP0tfgg9hsZWo5ZboYGuBn/bbYT/hdLPVSS4NMmiRJdwWhP0IznPwN9AE1JwyGsjSPLC364I0Qh5p+EPkGPNpg==
+  dependencies:
+    "@babel/helper-member-expression-to-functions" "^7.7.4"
+    "@babel/helper-optimise-call-expression" "^7.7.4"
+    "@babel/traverse" "^7.7.4"
+    "@babel/types" "^7.7.4"
+
 "@babel/helper-simple-access@^7.1.0":
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.1.0.tgz#65eeb954c8c245beaa4e859da6188f39d71e585c"
@@ -235,6 +391,14 @@
     "@babel/template" "^7.1.0"
     "@babel/types" "^7.0.0"
 
+"@babel/helper-simple-access@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.7.4.tgz#a169a0adb1b5f418cfc19f22586b2ebf58a9a294"
+  integrity sha512-zK7THeEXfan7UlWsG2A6CI/L9jVnI5+xxKZOdej39Y0YtDYKx9raHk5F2EtK9K8DHRTihYwg20ADt9S36GR78A==
+  dependencies:
+    "@babel/template" "^7.7.4"
+    "@babel/types" "^7.7.4"
+
 "@babel/helper-split-export-declaration@^7.0.0", "@babel/helper-split-export-declaration@^7.4.0":
   version "7.4.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.0.tgz#571bfd52701f492920d63b7f735030e9a3e10b55"
@@ -249,6 +413,13 @@
   dependencies:
     "@babel/types" "^7.4.4"
 
+"@babel/helper-split-export-declaration@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.7.4.tgz#57292af60443c4a3622cf74040ddc28e68336fd8"
+  integrity sha512-guAg1SXFcVr04Guk9eq0S4/rWS++sbmyqosJzVs8+1fH5NI+ZcmkaSkc7dmtAFbHFva6yRJnjW3yAcGxjueDug==
+  dependencies:
+    "@babel/types" "^7.7.4"
+
 "@babel/helper-wrap-function@^7.1.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.2.0.tgz#c4e0012445769e2815b55296ead43a958549f6fa"
@@ -259,6 +430,16 @@
     "@babel/traverse" "^7.1.0"
     "@babel/types" "^7.2.0"
 
+"@babel/helper-wrap-function@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.7.4.tgz#37ab7fed5150e22d9d7266e830072c0cdd8baace"
+  integrity sha512-VsfzZt6wmsocOaVU0OokwrIytHND55yvyT4BPB9AIIgwr8+x7617hetdJTsuGwygN5RC6mxA9EJztTjuwm2ofg==
+  dependencies:
+    "@babel/helper-function-name" "^7.7.4"
+    "@babel/template" "^7.7.4"
+    "@babel/traverse" "^7.7.4"
+    "@babel/types" "^7.7.4"
+
 "@babel/helpers@^7.4.4":
   version "7.5.5"
   resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.5.5.tgz#63908d2a73942229d1e6685bc2a0e730dde3b75e"
@@ -268,6 +449,15 @@
     "@babel/traverse" "^7.5.5"
     "@babel/types" "^7.5.5"
 
+"@babel/helpers@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.7.4.tgz#62c215b9e6c712dadc15a9a0dcab76c92a940302"
+  integrity sha512-ak5NGZGJ6LV85Q1Zc9gn2n+ayXOizryhjSUBTdu5ih1tlVCJeuQENzc4ItyCVhINVXvIT/ZQ4mheGIsfBkpskg==
+  dependencies:
+    "@babel/template" "^7.7.4"
+    "@babel/traverse" "^7.7.4"
+    "@babel/types" "^7.7.4"
+
 "@babel/highlight@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0.tgz#f710c38c8d458e6dd9a201afb637fcb781ce99e4"
@@ -287,6 +477,11 @@
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.5.5.tgz#02f077ac8817d3df4a832ef59de67565e71cca4b"
   integrity sha512-E5BN68cqR7dhKan1SfqgPGhQ178bkVKpXTPEXnFJBrEt8/DKRZlybmy+IgYLTeN7tp1R5Ccmbm2rBk17sHYU3g==
 
+"@babel/parser@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.7.4.tgz#75ab2d7110c2cf2fa949959afb05fa346d2231bb"
+  integrity sha512-jIwvLO0zCL+O/LmEJQjWA75MQTWwx3c3u2JOTDK5D3/9egrWRRA0/0hk9XXywYnXZVVpzrBYeIQTmhwUaePI9g==
+
 "@babel/plugin-proposal-async-generator-functions@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.2.0.tgz#b289b306669dce4ad20b0252889a15768c9d417e"
@@ -296,6 +491,15 @@
     "@babel/helper-remap-async-to-generator" "^7.1.0"
     "@babel/plugin-syntax-async-generators" "^7.2.0"
 
+"@babel/plugin-proposal-async-generator-functions@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.7.4.tgz#0351c5ac0a9e927845fffd5b82af476947b7ce6d"
+  integrity sha512-1ypyZvGRXriY/QP668+s8sFr2mqinhkRDMPSQLNghCQE+GAkFtp+wkHVvg2+Hdki8gwP+NFzJBJ/N1BfzCCDEw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-remap-async-to-generator" "^7.7.4"
+    "@babel/plugin-syntax-async-generators" "^7.7.4"
+
 "@babel/plugin-proposal-class-properties@7.3.0":
   version "7.3.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.3.0.tgz#272636bc0fa19a0bc46e601ec78136a173ea36cd"
@@ -304,6 +508,14 @@
     "@babel/helper-create-class-features-plugin" "^7.3.0"
     "@babel/helper-plugin-utils" "^7.0.0"
 
+"@babel/plugin-proposal-dynamic-import@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.7.4.tgz#dde64a7f127691758cbfed6cf70de0fa5879d52d"
+  integrity sha512-StH+nGAdO6qDB1l8sZ5UBV8AC3F2VW2I8Vfld73TMKyptMU9DY5YsJAS8U81+vEtxcH3Y/La0wG0btDrhpnhjQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-syntax-dynamic-import" "^7.7.4"
+
 "@babel/plugin-proposal-json-strings@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.2.0.tgz#568ecc446c6148ae6b267f02551130891e29f317"
@@ -312,6 +524,14 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-json-strings" "^7.2.0"
 
+"@babel/plugin-proposal-json-strings@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.7.4.tgz#7700a6bfda771d8dc81973249eac416c6b4c697d"
+  integrity sha512-wQvt3akcBTfLU/wYoqm/ws7YOAQKu8EVJEvHip/mzkNtjaclQoCCIqKXFP5/eyfnfbQCDV3OLRIK3mIVyXuZlw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-syntax-json-strings" "^7.7.4"
+
 "@babel/plugin-proposal-object-rest-spread@7.3.2":
   version "7.3.2"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.3.2.tgz#6d1859882d4d778578e41f82cc5d7bf3d5daf6c1"
@@ -328,6 +548,14 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-object-rest-spread" "^7.2.0"
 
+"@babel/plugin-proposal-object-rest-spread@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.7.4.tgz#cc57849894a5c774214178c8ab64f6334ec8af71"
+  integrity sha512-rnpnZR3/iWKmiQyJ3LKJpSwLDcX/nSXhdLk4Aq/tXOApIvyu7qoabrige0ylsAJffaUC51WiBu209Q0U+86OWQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-syntax-object-rest-spread" "^7.7.4"
+
 "@babel/plugin-proposal-optional-catch-binding@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.2.0.tgz#135d81edb68a081e55e56ec48541ece8065c38f5"
@@ -336,6 +564,14 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-optional-catch-binding" "^7.2.0"
 
+"@babel/plugin-proposal-optional-catch-binding@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.7.4.tgz#ec21e8aeb09ec6711bc0a39ca49520abee1de379"
+  integrity sha512-DyM7U2bnsQerCQ+sejcTNZh8KQEUuC3ufzdnVnSiUv/qoGJp2Z3hanKL18KDhsBT5Wj6a7CMT5mdyCNJsEaA9w==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.7.4"
+
 "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
   version "7.4.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.4.4.tgz#501ffd9826c0b91da22690720722ac7cb1ca9c78"
@@ -345,6 +581,14 @@
     "@babel/helper-regex" "^7.4.4"
     regexpu-core "^4.5.4"
 
+"@babel/plugin-proposal-unicode-property-regex@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.7.4.tgz#7c239ccaf09470dbe1d453d50057460e84517ebb"
+  integrity sha512-cHgqHgYvffluZk85dJ02vloErm3Y6xtH+2noOBOJ2kXOJH3aVCDnj5eR/lVNlTnYu4hndAPJD3rTFjW3qee0PA==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.7.4"
+    "@babel/helper-plugin-utils" "^7.0.0"
+
 "@babel/plugin-syntax-async-generators@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.2.0.tgz#69e1f0db34c6f5a0cf7e2b3323bf159a76c8cb7f"
@@ -352,6 +596,20 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
+"@babel/plugin-syntax-async-generators@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.7.4.tgz#331aaf310a10c80c44a66b238b6e49132bd3c889"
+  integrity sha512-Li4+EjSpBgxcsmeEF8IFcfV/+yJGxHXDirDkEoyFjumuwbmfCVHUt0HuowD/iGM7OhIRyXJH9YXxqiH6N815+g==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-syntax-dynamic-import@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.7.4.tgz#29ca3b4415abfe4a5ec381e903862ad1a54c3aec"
+  integrity sha512-jHQW0vbRGvwQNgyVxwDh4yuXu4bH1f5/EICJLAhl1SblLs2CDhrsmCk+v5XLdE9wxtAFRyxx+P//Iw+a5L/tTg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
 "@babel/plugin-syntax-json-strings@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.2.0.tgz#72bd13f6ffe1d25938129d2a186b11fd62951470"
@@ -359,6 +617,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
+"@babel/plugin-syntax-json-strings@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.7.4.tgz#86e63f7d2e22f9e27129ac4e83ea989a382e86cc"
+  integrity sha512-QpGupahTQW1mHRXddMG5srgpHWqRLwJnJZKXTigB9RPFCCGbDGCgBeM/iC82ICXp414WeYx/tD54w7M2qRqTMg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
 "@babel/plugin-syntax-jsx@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.2.0.tgz#0b85a3b4bc7cdf4cc4b8bf236335b907ca22e7c7"
@@ -373,6 +638,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
+"@babel/plugin-syntax-object-rest-spread@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.7.4.tgz#47cf220d19d6d0d7b154304701f468fc1cc6ff46"
+  integrity sha512-mObR+r+KZq0XhRVS2BrBKBpr5jqrqzlPvS9C9vuOf5ilSwzloAl7RPWLrgKdWS6IreaVrjHxTjtyqFiOisaCwg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
 "@babel/plugin-syntax-optional-catch-binding@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.2.0.tgz#a94013d6eda8908dfe6a477e7f9eda85656ecf5c"
@@ -380,6 +652,20 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
+"@babel/plugin-syntax-optional-catch-binding@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.7.4.tgz#a3e38f59f4b6233867b4a92dcb0ee05b2c334aa6"
+  integrity sha512-4ZSuzWgFxqHRE31Glu+fEr/MirNZOMYmD/0BhBWyLyOOQz/gTAl7QmWm2hX1QxEIXsr2vkdlwxIzTyiYRC4xcQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-syntax-top-level-await@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.7.4.tgz#bd7d8fa7b9fee793a36e4027fd6dd1aa32f946da"
+  integrity sha512-wdsOw0MvkL1UIgiQ/IFr3ETcfv1xb8RMM0H9wbiDyLaJFyiDg5oZvDLCXosIXmFeIlweML5iOBXAkqddkYNizg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
 "@babel/plugin-transform-arrow-functions@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.2.0.tgz#9aeafbe4d6ffc6563bf8f8372091628f00779550"
@@ -387,6 +673,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
+"@babel/plugin-transform-arrow-functions@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.7.4.tgz#76309bd578addd8aee3b379d809c802305a98a12"
+  integrity sha512-zUXy3e8jBNPiffmqkHRNDdZM2r8DWhCB7HhcoyZjiK1TxYEluLHAvQuYnTT+ARqRpabWqy/NHkO6e3MsYB5YfA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
 "@babel/plugin-transform-async-to-generator@^7.4.4":
   version "7.5.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.5.0.tgz#89a3848a0166623b5bc481164b5936ab947e887e"
@@ -396,6 +689,15 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/helper-remap-async-to-generator" "^7.1.0"
 
+"@babel/plugin-transform-async-to-generator@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.7.4.tgz#694cbeae6d613a34ef0292713fa42fb45c4470ba"
+  integrity sha512-zpUTZphp5nHokuy8yLlyafxCJ0rSlFoSHypTUWgpdwoDXWQcseaect7cJ8Ppk6nunOM6+5rPMkod4OYKPR5MUg==
+  dependencies:
+    "@babel/helper-module-imports" "^7.7.4"
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-remap-async-to-generator" "^7.7.4"
+
 "@babel/plugin-transform-block-scoped-functions@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.2.0.tgz#5d3cc11e8d5ddd752aa64c9148d0db6cb79fd190"
@@ -403,6 +705,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
+"@babel/plugin-transform-block-scoped-functions@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.7.4.tgz#d0d9d5c269c78eaea76227ace214b8d01e4d837b"
+  integrity sha512-kqtQzwtKcpPclHYjLK//3lH8OFsCDuDJBaFhVwf8kqdnF6MN4l618UDlcA7TfRs3FayrHj+svYnSX8MC9zmUyQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
 "@babel/plugin-transform-block-scoping@^7.4.4":
   version "7.5.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.5.5.tgz#a35f395e5402822f10d2119f6f8e045e3639a2ce"
@@ -411,6 +720,14 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     lodash "^4.17.13"
 
+"@babel/plugin-transform-block-scoping@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.7.4.tgz#200aad0dcd6bb80372f94d9e628ea062c58bf224"
+  integrity sha512-2VBe9u0G+fDt9B5OV5DQH4KBf5DoiNkwFKOz0TCvBWvdAN2rOykCTkrL+jTLxfCAm76l9Qo5OqL7HBOx2dWggg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    lodash "^4.17.13"
+
 "@babel/plugin-transform-classes@^7.4.4":
   version "7.5.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.5.5.tgz#d094299d9bd680a14a2a0edae38305ad60fb4de9"
@@ -425,6 +742,20 @@
     "@babel/helper-split-export-declaration" "^7.4.4"
     globals "^11.1.0"
 
+"@babel/plugin-transform-classes@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.7.4.tgz#c92c14be0a1399e15df72667067a8f510c9400ec"
+  integrity sha512-sK1mjWat7K+buWRuImEzjNf68qrKcrddtpQo3swi9j7dUcG6y6R6+Di039QN2bD1dykeswlagupEmpOatFHHUg==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.7.4"
+    "@babel/helper-define-map" "^7.7.4"
+    "@babel/helper-function-name" "^7.7.4"
+    "@babel/helper-optimise-call-expression" "^7.7.4"
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-replace-supers" "^7.7.4"
+    "@babel/helper-split-export-declaration" "^7.7.4"
+    globals "^11.1.0"
+
 "@babel/plugin-transform-computed-properties@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.2.0.tgz#83a7df6a658865b1c8f641d510c6f3af220216da"
@@ -432,6 +763,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
+"@babel/plugin-transform-computed-properties@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.7.4.tgz#e856c1628d3238ffe12d668eb42559f79a81910d"
+  integrity sha512-bSNsOsZnlpLLyQew35rl4Fma3yKWqK3ImWMSC/Nc+6nGjC9s5NFWAer1YQ899/6s9HxO2zQC1WoFNfkOqRkqRQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
 "@babel/plugin-transform-destructuring@^7.4.4":
   version "7.5.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.5.0.tgz#f6c09fdfe3f94516ff074fe877db7bc9ef05855a"
@@ -439,6 +777,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
+"@babel/plugin-transform-destructuring@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.7.4.tgz#2b713729e5054a1135097b6a67da1b6fe8789267"
+  integrity sha512-4jFMXI1Cu2aXbcXXl8Lr6YubCn6Oc7k9lLsu8v61TZh+1jny2BWmdtvY9zSUlLdGUvcy9DMAWyZEOqjsbeg/wA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
 "@babel/plugin-transform-dotall-regex@^7.4.4":
   version "7.4.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.4.4.tgz#361a148bc951444312c69446d76ed1ea8e4450c3"
@@ -448,6 +793,14 @@
     "@babel/helper-regex" "^7.4.4"
     regexpu-core "^4.5.4"
 
+"@babel/plugin-transform-dotall-regex@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.7.4.tgz#f7ccda61118c5b7a2599a72d5e3210884a021e96"
+  integrity sha512-mk0cH1zyMa/XHeb6LOTXTbG7uIJ8Rrjlzu91pUx/KS3JpcgaTDwMS8kM+ar8SLOvlL2Lofi4CGBAjCo3a2x+lw==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.7.4"
+    "@babel/helper-plugin-utils" "^7.0.0"
+
 "@babel/plugin-transform-duplicate-keys@^7.2.0":
   version "7.5.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.5.0.tgz#c5dbf5106bf84cdf691222c0974c12b1df931853"
@@ -455,6 +808,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
+"@babel/plugin-transform-duplicate-keys@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.7.4.tgz#3d21731a42e3f598a73835299dd0169c3b90ac91"
+  integrity sha512-g1y4/G6xGWMD85Tlft5XedGaZBCIVN+/P0bs6eabmcPP9egFleMAo65OOjlhcz1njpwagyY3t0nsQC9oTFegJA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
 "@babel/plugin-transform-exponentiation-operator@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.2.0.tgz#a63868289e5b4007f7054d46491af51435766008"
@@ -463,6 +823,14 @@
     "@babel/helper-builder-binary-assignment-operator-visitor" "^7.1.0"
     "@babel/helper-plugin-utils" "^7.0.0"
 
+"@babel/plugin-transform-exponentiation-operator@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.7.4.tgz#dd30c0191e3a1ba19bcc7e389bdfddc0729d5db9"
+  integrity sha512-MCqiLfCKm6KEA1dglf6Uqq1ElDIZwFuzz1WH5mTf8k2uQSxEJMbOIEh7IZv7uichr7PMfi5YVSrr1vz+ipp7AQ==
+  dependencies:
+    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.7.4"
+    "@babel/helper-plugin-utils" "^7.0.0"
+
 "@babel/plugin-transform-for-of@^7.4.4":
   version "7.4.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.4.4.tgz#0267fc735e24c808ba173866c6c4d1440fc3c556"
@@ -470,6 +838,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
+"@babel/plugin-transform-for-of@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.7.4.tgz#248800e3a5e507b1f103d8b4ca998e77c63932bc"
+  integrity sha512-zZ1fD1B8keYtEcKF+M1TROfeHTKnijcVQm0yO/Yu1f7qoDoxEIc/+GX6Go430Bg84eM/xwPFp0+h4EbZg7epAA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
 "@babel/plugin-transform-function-name@^7.4.4":
   version "7.4.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.4.4.tgz#e1436116abb0610c2259094848754ac5230922ad"
@@ -478,6 +853,14 @@
     "@babel/helper-function-name" "^7.1.0"
     "@babel/helper-plugin-utils" "^7.0.0"
 
+"@babel/plugin-transform-function-name@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.7.4.tgz#75a6d3303d50db638ff8b5385d12451c865025b1"
+  integrity sha512-E/x09TvjHNhsULs2IusN+aJNRV5zKwxu1cpirZyRPw+FyyIKEHPXTsadj48bVpc1R5Qq1B5ZkzumuFLytnbT6g==
+  dependencies:
+    "@babel/helper-function-name" "^7.7.4"
+    "@babel/helper-plugin-utils" "^7.0.0"
+
 "@babel/plugin-transform-literals@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.2.0.tgz#690353e81f9267dad4fd8cfd77eafa86aba53ea1"
@@ -485,6 +868,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
+"@babel/plugin-transform-literals@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.7.4.tgz#27fe87d2b5017a2a5a34d1c41a6b9f6a6262643e"
+  integrity sha512-X2MSV7LfJFm4aZfxd0yLVFrEXAgPqYoDG53Br/tCKiKYfX0MjVjQeWPIhPHHsCqzwQANq+FLN786fF5rgLS+gw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
 "@babel/plugin-transform-member-expression-literals@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.2.0.tgz#fa10aa5c58a2cb6afcf2c9ffa8cb4d8b3d489a2d"
@@ -492,6 +882,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
+"@babel/plugin-transform-member-expression-literals@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.7.4.tgz#aee127f2f3339fc34ce5e3055d7ffbf7aa26f19a"
+  integrity sha512-9VMwMO7i69LHTesL0RdGy93JU6a+qOPuvB4F4d0kR0zyVjJRVJRaoaGjhtki6SzQUu8yen/vxPKN6CWnCUw6bA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
 "@babel/plugin-transform-modules-amd@^7.2.0":
   version "7.5.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.5.0.tgz#ef00435d46da0a5961aa728a1d2ecff063e4fb91"
@@ -501,6 +898,15 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     babel-plugin-dynamic-import-node "^2.3.0"
 
+"@babel/plugin-transform-modules-amd@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.7.4.tgz#276b3845ca2b228f2995e453adc2e6f54d72fb71"
+  integrity sha512-/542/5LNA18YDtg1F+QHvvUSlxdvjZoD/aldQwkq+E3WCkbEjNSN9zdrOXaSlfg3IfGi22ijzecklF/A7kVZFQ==
+  dependencies:
+    "@babel/helper-module-transforms" "^7.7.4"
+    "@babel/helper-plugin-utils" "^7.0.0"
+    babel-plugin-dynamic-import-node "^2.3.0"
+
 "@babel/plugin-transform-modules-commonjs@^7.4.4":
   version "7.5.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.5.0.tgz#425127e6045231360858eeaa47a71d75eded7a74"
@@ -511,6 +917,16 @@
     "@babel/helper-simple-access" "^7.1.0"
     babel-plugin-dynamic-import-node "^2.3.0"
 
+"@babel/plugin-transform-modules-commonjs@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.7.4.tgz#bee4386e550446343dd52a571eda47851ff857a3"
+  integrity sha512-k8iVS7Jhc367IcNF53KCwIXtKAH7czev866ThsTgy8CwlXjnKZna2VHwChglzLleYrcHz1eQEIJlGRQxB53nqA==
+  dependencies:
+    "@babel/helper-module-transforms" "^7.7.4"
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-simple-access" "^7.7.4"
+    babel-plugin-dynamic-import-node "^2.3.0"
+
 "@babel/plugin-transform-modules-systemjs@^7.4.4":
   version "7.5.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.5.0.tgz#e75266a13ef94202db2a0620977756f51d52d249"
@@ -520,6 +936,15 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     babel-plugin-dynamic-import-node "^2.3.0"
 
+"@babel/plugin-transform-modules-systemjs@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.7.4.tgz#cd98152339d3e763dfe838b7d4273edaf520bb30"
+  integrity sha512-y2c96hmcsUi6LrMqvmNDPBBiGCiQu0aYqpHatVVu6kD4mFEXKjyNxd/drc18XXAf9dv7UXjrZwBVmTTGaGP8iw==
+  dependencies:
+    "@babel/helper-hoist-variables" "^7.7.4"
+    "@babel/helper-plugin-utils" "^7.0.0"
+    babel-plugin-dynamic-import-node "^2.3.0"
+
 "@babel/plugin-transform-modules-umd@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.2.0.tgz#7678ce75169f0877b8eb2235538c074268dd01ae"
@@ -528,6 +953,14 @@
     "@babel/helper-module-transforms" "^7.1.0"
     "@babel/helper-plugin-utils" "^7.0.0"
 
+"@babel/plugin-transform-modules-umd@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.7.4.tgz#1027c355a118de0aae9fee00ad7813c584d9061f"
+  integrity sha512-u2B8TIi0qZI4j8q4C51ktfO7E3cQ0qnaXFI1/OXITordD40tt17g/sXqgNNCcMTcBFKrUPcGDx+TBJuZxLx7tw==
+  dependencies:
+    "@babel/helper-module-transforms" "^7.7.4"
+    "@babel/helper-plugin-utils" "^7.0.0"
+
 "@babel/plugin-transform-named-capturing-groups-regex@^7.4.5":
   version "7.4.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.4.5.tgz#9d269fd28a370258199b4294736813a60bbdd106"
@@ -535,6 +968,13 @@
   dependencies:
     regexp-tree "^0.1.6"
 
+"@babel/plugin-transform-named-capturing-groups-regex@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.7.4.tgz#fb3bcc4ee4198e7385805007373d6b6f42c98220"
+  integrity sha512-jBUkiqLKvUWpv9GLSuHUFYdmHg0ujC1JEYoZUfeOOfNydZXp1sXObgyPatpcwjWgsdBGsagWW0cdJpX/DO2jMw==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.7.4"
+
 "@babel/plugin-transform-new-target@^7.4.4":
   version "7.4.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.4.4.tgz#18d120438b0cc9ee95a47f2c72bc9768fbed60a5"
@@ -542,6 +982,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
+"@babel/plugin-transform-new-target@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.7.4.tgz#4a0753d2d60639437be07b592a9e58ee00720167"
+  integrity sha512-CnPRiNtOG1vRodnsyGX37bHQleHE14B9dnnlgSeEs3ek3fHN1A1SScglTCg1sfbe7sRQ2BUcpgpTpWSfMKz3gg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
 "@babel/plugin-transform-object-super@^7.2.0":
   version "7.5.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.5.5.tgz#c70021df834073c65eb613b8679cc4a381d1a9f9"
@@ -550,6 +997,14 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/helper-replace-supers" "^7.5.5"
 
+"@babel/plugin-transform-object-super@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.7.4.tgz#48488937a2d586c0148451bf51af9d7dda567262"
+  integrity sha512-ho+dAEhC2aRnff2JCA0SAK7V2R62zJd/7dmtoe7MHcso4C2mS+vZjn1Pb1pCVZvJs1mgsvv5+7sT+m3Bysb6eg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-replace-supers" "^7.7.4"
+
 "@babel/plugin-transform-parameters@^7.4.4":
   version "7.4.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.4.4.tgz#7556cf03f318bd2719fe4c922d2d808be5571e16"
@@ -559,6 +1014,15 @@
     "@babel/helper-get-function-arity" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
 
+"@babel/plugin-transform-parameters@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.7.4.tgz#da4555c97f39b51ac089d31c7380f03bca4075ce"
+  integrity sha512-VJwhVePWPa0DqE9vcfptaJSzNDKrWU/4FbYCjZERtmqEs05g3UMXnYMZoXja7JAJ7Y7sPZipwm/pGApZt7wHlw==
+  dependencies:
+    "@babel/helper-call-delegate" "^7.7.4"
+    "@babel/helper-get-function-arity" "^7.7.4"
+    "@babel/helper-plugin-utils" "^7.0.0"
+
 "@babel/plugin-transform-property-literals@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.2.0.tgz#03e33f653f5b25c4eb572c98b9485055b389e905"
@@ -566,6 +1030,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
+"@babel/plugin-transform-property-literals@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.7.4.tgz#2388d6505ef89b266103f450f9167e6bd73f98c2"
+  integrity sha512-MatJhlC4iHsIskWYyawl53KuHrt+kALSADLQQ/HkhTjX954fkxIEh4q5slL4oRAnsm/eDoZ4q0CIZpcqBuxhJQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
 "@babel/plugin-transform-react-display-name@^7.0.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.2.0.tgz#ebfaed87834ce8dc4279609a4f0c324c156e3eb0"
@@ -605,6 +1076,13 @@
   dependencies:
     regenerator-transform "^0.14.0"
 
+"@babel/plugin-transform-regenerator@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.7.4.tgz#d18eac0312a70152d7d914cbed2dc3999601cfc0"
+  integrity sha512-e7MWl5UJvmPEwFJTwkBlPmqixCtr9yAASBqff4ggXTNicZiwbF8Eefzm6NVgfiBp7JdAGItecnctKTgH44q2Jw==
+  dependencies:
+    regenerator-transform "^0.14.0"
+
 "@babel/plugin-transform-reserved-words@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.2.0.tgz#4792af87c998a49367597d07fedf02636d2e1634"
@@ -612,6 +1090,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
+"@babel/plugin-transform-reserved-words@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.7.4.tgz#6a7cf123ad175bb5c69aec8f6f0770387ed3f1eb"
+  integrity sha512-OrPiUB5s5XvkCO1lS7D8ZtHcswIC57j62acAnJZKqGGnHP+TIc/ljQSrgdX/QyOTdEK5COAhuc820Hi1q2UgLQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
 "@babel/plugin-transform-runtime@7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.2.0.tgz#566bc43f7d0aedc880eaddbd29168d0f248966ea"
@@ -629,6 +1114,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
+"@babel/plugin-transform-shorthand-properties@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.7.4.tgz#74a0a9b2f6d67a684c6fbfd5f0458eb7ba99891e"
+  integrity sha512-q+suddWRfIcnyG5YiDP58sT65AJDZSUhXQDZE3r04AuqD6d/XLaQPPXSBzP2zGerkgBivqtQm9XKGLuHqBID6Q==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
 "@babel/plugin-transform-spread@^7.2.0":
   version "7.2.2"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.2.2.tgz#3103a9abe22f742b6d406ecd3cd49b774919b406"
@@ -636,6 +1128,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
+"@babel/plugin-transform-spread@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.7.4.tgz#aa673b356fe6b7e70d69b6e33a17fef641008578"
+  integrity sha512-8OSs0FLe5/80cndziPlg4R0K6HcWSM0zyNhHhLsmw/Nc5MaA49cAsnoJ/t/YZf8qkG7fD+UjTRaApVDB526d7Q==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
 "@babel/plugin-transform-sticky-regex@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.2.0.tgz#a1e454b5995560a9c1e0d537dfc15061fd2687e1"
@@ -644,6 +1143,14 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/helper-regex" "^7.0.0"
 
+"@babel/plugin-transform-sticky-regex@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.7.4.tgz#ffb68c05090c30732076b1285dc1401b404a123c"
+  integrity sha512-Ls2NASyL6qtVe1H1hXts9yuEeONV2TJZmplLONkMPUG158CtmnrzW5Q5teibM5UVOFjG0D3IC5mzXR6pPpUY7A==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-regex" "^7.0.0"
+
 "@babel/plugin-transform-template-literals@^7.4.4":
   version "7.4.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.4.4.tgz#9d28fea7bbce637fb7612a0750989d8321d4bcb0"
@@ -652,6 +1159,14 @@
     "@babel/helper-annotate-as-pure" "^7.0.0"
     "@babel/helper-plugin-utils" "^7.0.0"
 
+"@babel/plugin-transform-template-literals@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.7.4.tgz#1eb6411736dd3fe87dbd20cc6668e5121c17d604"
+  integrity sha512-sA+KxLwF3QwGj5abMHkHgshp9+rRz+oY9uoRil4CyLtgEuE/88dpkeWgNk5qKVsJE9iSfly3nvHapdRiIS2wnQ==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.7.4"
+    "@babel/helper-plugin-utils" "^7.0.0"
+
 "@babel/plugin-transform-typeof-symbol@^7.2.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.2.0.tgz#117d2bcec2fbf64b4b59d1f9819894682d29f2b2"
@@ -659,6 +1174,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
+"@babel/plugin-transform-typeof-symbol@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.7.4.tgz#3174626214f2d6de322882e498a38e8371b2140e"
+  integrity sha512-KQPUQ/7mqe2m0B8VecdyaW5XcQYaePyl9R7IsKd+irzj6jvbhoGnRE+M0aNkyAzI07VfUQ9266L5xMARitV3wg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+
 "@babel/plugin-transform-unicode-regex@^7.4.4":
   version "7.4.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.4.4.tgz#ab4634bb4f14d36728bf5978322b35587787970f"
@@ -668,6 +1190,14 @@
     "@babel/helper-regex" "^7.4.4"
     regexpu-core "^4.5.4"
 
+"@babel/plugin-transform-unicode-regex@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.7.4.tgz#a3c0f65b117c4c81c5b6484f2a5e7b95346b83ae"
+  integrity sha512-N77UUIV+WCvE+5yHw+oks3m18/umd7y392Zv7mYTpFqHtkpcc+QUz+gLJNTWVlWROIWeLqY0f3OjZxV5TcXnRw==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.7.4"
+    "@babel/helper-plugin-utils" "^7.0.0"
+
 "@babel/preset-env@7.4.5":
   version "7.4.5"
   resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.4.5.tgz#2fad7f62983d5af563b5f3139242755884998a58"
@@ -722,6 +1252,63 @@
     js-levenshtein "^1.1.3"
     semver "^5.5.0"
 
+"@babel/preset-env@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.7.4.tgz#ccaf309ae8d1ee2409c85a4e2b5e280ceee830f8"
+  integrity sha512-Dg+ciGJjwvC1NIe/DGblMbcGq1HOtKbw8RLl4nIjlfcILKEOkWT/vRqPpumswABEBVudii6dnVwrBtzD7ibm4g==
+  dependencies:
+    "@babel/helper-module-imports" "^7.7.4"
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-proposal-async-generator-functions" "^7.7.4"
+    "@babel/plugin-proposal-dynamic-import" "^7.7.4"
+    "@babel/plugin-proposal-json-strings" "^7.7.4"
+    "@babel/plugin-proposal-object-rest-spread" "^7.7.4"
+    "@babel/plugin-proposal-optional-catch-binding" "^7.7.4"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.7.4"
+    "@babel/plugin-syntax-async-generators" "^7.7.4"
+    "@babel/plugin-syntax-dynamic-import" "^7.7.4"
+    "@babel/plugin-syntax-json-strings" "^7.7.4"
+    "@babel/plugin-syntax-object-rest-spread" "^7.7.4"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.7.4"
+    "@babel/plugin-syntax-top-level-await" "^7.7.4"
+    "@babel/plugin-transform-arrow-functions" "^7.7.4"
+    "@babel/plugin-transform-async-to-generator" "^7.7.4"
+    "@babel/plugin-transform-block-scoped-functions" "^7.7.4"
+    "@babel/plugin-transform-block-scoping" "^7.7.4"
+    "@babel/plugin-transform-classes" "^7.7.4"
+    "@babel/plugin-transform-computed-properties" "^7.7.4"
+    "@babel/plugin-transform-destructuring" "^7.7.4"
+    "@babel/plugin-transform-dotall-regex" "^7.7.4"
+    "@babel/plugin-transform-duplicate-keys" "^7.7.4"
+    "@babel/plugin-transform-exponentiation-operator" "^7.7.4"
+    "@babel/plugin-transform-for-of" "^7.7.4"
+    "@babel/plugin-transform-function-name" "^7.7.4"
+    "@babel/plugin-transform-literals" "^7.7.4"
+    "@babel/plugin-transform-member-expression-literals" "^7.7.4"
+    "@babel/plugin-transform-modules-amd" "^7.7.4"
+    "@babel/plugin-transform-modules-commonjs" "^7.7.4"
+    "@babel/plugin-transform-modules-systemjs" "^7.7.4"
+    "@babel/plugin-transform-modules-umd" "^7.7.4"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.7.4"
+    "@babel/plugin-transform-new-target" "^7.7.4"
+    "@babel/plugin-transform-object-super" "^7.7.4"
+    "@babel/plugin-transform-parameters" "^7.7.4"
+    "@babel/plugin-transform-property-literals" "^7.7.4"
+    "@babel/plugin-transform-regenerator" "^7.7.4"
+    "@babel/plugin-transform-reserved-words" "^7.7.4"
+    "@babel/plugin-transform-shorthand-properties" "^7.7.4"
+    "@babel/plugin-transform-spread" "^7.7.4"
+    "@babel/plugin-transform-sticky-regex" "^7.7.4"
+    "@babel/plugin-transform-template-literals" "^7.7.4"
+    "@babel/plugin-transform-typeof-symbol" "^7.7.4"
+    "@babel/plugin-transform-unicode-regex" "^7.7.4"
+    "@babel/types" "^7.7.4"
+    browserslist "^4.6.0"
+    core-js-compat "^3.1.1"
+    invariant "^2.2.2"
+    js-levenshtein "^1.1.3"
+    semver "^5.5.0"
+
 "@babel/preset-react@7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.0.0.tgz#e86b4b3d99433c7b3e9e91747e2653958bc6b3c0"
@@ -733,6 +1320,25 @@
     "@babel/plugin-transform-react-jsx-self" "^7.0.0"
     "@babel/plugin-transform-react-jsx-source" "^7.0.0"
 
+"@babel/register@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.7.4.tgz#45a4956471a9df3b012b747f5781cc084ee8f128"
+  integrity sha512-/fmONZqL6ZMl9KJUYajetCrID6m0xmL4odX7v+Xvoxcv0DdbP/oO0TWIeLUCHqczQ6L6njDMqmqHFy2cp3FFsA==
+  dependencies:
+    find-cache-dir "^2.0.0"
+    lodash "^4.17.13"
+    make-dir "^2.1.0"
+    pirates "^4.0.0"
+    source-map-support "^0.5.16"
+
+"@babel/runtime-corejs2@^7.2.0":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/runtime-corejs2/-/runtime-corejs2-7.7.4.tgz#b9c2b1b5882762005785bc47740195a0ac780888"
+  integrity sha512-hKNcmHQbBSJFnZ82ewYtWDZ3fXkP/l1XcfRtm7c8gHPM/DMecJtFFBEp7KMLZTuHwwb7RfemHdsEnd7L916Z6A==
+  dependencies:
+    core-js "^2.6.5"
+    regenerator-runtime "^0.13.2"
+
 "@babel/runtime@7.3.1":
   version "7.3.1"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.3.1.tgz#574b03e8e8a9898eaf4a872a92ea20b7846f6f2a"
@@ -765,6 +1371,15 @@
     "@babel/parser" "^7.4.4"
     "@babel/types" "^7.4.4"
 
+"@babel/template@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.7.4.tgz#428a7d9eecffe27deac0a98e23bf8e3675d2a77b"
+  integrity sha512-qUzihgVPguAzXCK7WXw8pqs6cEwi54s3E+HrejlkuWO6ivMKx9hZl3Y2fSXp9i5HgyWmj7RKP+ulaYnKM4yYxw==
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    "@babel/parser" "^7.7.4"
+    "@babel/types" "^7.7.4"
+
 "@babel/traverse@^7.1.0":
   version "7.4.0"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.4.0.tgz#14006967dd1d2b3494cdd650c686db9daf0ddada"
@@ -795,6 +1410,21 @@
     globals "^11.1.0"
     lodash "^4.17.13"
 
+"@babel/traverse@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.7.4.tgz#9c1e7c60fb679fe4fcfaa42500833333c2058558"
+  integrity sha512-P1L58hQyupn8+ezVA2z5KBm4/Zr4lCC8dwKCMYzsa5jFMDMQAzaBNy9W5VjB+KAmBjb40U7a/H6ao+Xo+9saIw==
+  dependencies:
+    "@babel/code-frame" "^7.5.5"
+    "@babel/generator" "^7.7.4"
+    "@babel/helper-function-name" "^7.7.4"
+    "@babel/helper-split-export-declaration" "^7.7.4"
+    "@babel/parser" "^7.7.4"
+    "@babel/types" "^7.7.4"
+    debug "^4.1.0"
+    globals "^11.1.0"
+    lodash "^4.17.13"
+
 "@babel/types@^7.0.0", "@babel/types@^7.2.0", "@babel/types@^7.2.2", "@babel/types@^7.3.0", "@babel/types@^7.4.0":
   version "7.4.0"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.4.0.tgz#670724f77d24cce6cc7d8cf64599d511d164894c"
@@ -813,6 +1443,15 @@
     lodash "^4.17.13"
     to-fast-properties "^2.0.0"
 
+"@babel/types@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.7.4.tgz#516570d539e44ddf308c07569c258ff94fde9193"
+  integrity sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA==
+  dependencies:
+    esutils "^2.0.2"
+    lodash "^4.17.13"
+    to-fast-properties "^2.0.0"
+
 "@cypress/browserify-preprocessor@^2.1.1":
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/@cypress/browserify-preprocessor/-/browserify-preprocessor-2.1.1.tgz#93e7c1228fee9dea9e80a1ccf0dd8cca1ffcbad8"
@@ -891,16 +1530,89 @@
   dependencies:
     "@hapi/hoek" "8.x.x"
 
+"@jest/console@^24.9.0":
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/@jest/console/-/console-24.9.0.tgz#79b1bc06fb74a8cfb01cbdedf945584b1b9707f0"
+  integrity sha512-Zuj6b8TnKXi3q4ymac8EQfc3ea/uhLeCGThFqXeC8H9/raaH8ARPUTdId+XyGd03Z4In0/VjD2OYFcBF09fNLQ==
+  dependencies:
+    "@jest/source-map" "^24.9.0"
+    chalk "^2.0.1"
+    slash "^2.0.0"
+
+"@jest/source-map@^24.9.0":
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-24.9.0.tgz#0e263a94430be4b41da683ccc1e6bffe2a191714"
+  integrity sha512-/Xw7xGlsZb4MJzNDgB7PW5crou5JqWiBQaz6xyPd3ArOg2nfn/PunV8+olXbbEZzNl591o5rWKE9BRDaFAuIBg==
+  dependencies:
+    callsites "^3.0.0"
+    graceful-fs "^4.1.15"
+    source-map "^0.6.0"
+
+"@jest/test-result@^24.9.0":
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-24.9.0.tgz#11796e8aa9dbf88ea025757b3152595ad06ba0ca"
+  integrity sha512-XEFrHbBonBJ8dGp2JmF8kP/nQI/ImPpygKHwQ/SY+es59Z3L5PI4Qb9TQQMAEeYsThG1xF0k6tmG0tIKATNiiA==
+  dependencies:
+    "@jest/console" "^24.9.0"
+    "@jest/types" "^24.9.0"
+    "@types/istanbul-lib-coverage" "^2.0.0"
+
+"@jest/types@^24.9.0":
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-24.9.0.tgz#63cb26cb7500d069e5a389441a7c6ab5e909fc59"
+  integrity sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==
+  dependencies:
+    "@types/istanbul-lib-coverage" "^2.0.0"
+    "@types/istanbul-reports" "^1.1.1"
+    "@types/yargs" "^13.0.0"
+
 "@types/color-name@^1.1.1":
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"
   integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==
 
+"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz#42995b446db9a48a11a07ec083499a860e9138ff"
+  integrity sha512-hRJD2ahnnpLgsj6KWMYSrmXkM3rm2Dl1qkx6IOFD5FnuNPXJIG5L0dhgKXCYTRMGzU4n0wImQ/xfmRc4POUFlg==
+
+"@types/istanbul-lib-report@*":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-1.1.1.tgz#e5471e7fa33c61358dd38426189c037a58433b8c"
+  integrity sha512-3BUTyMzbZa2DtDI2BkERNC6jJw2Mr2Y0oGI7mRxYNBPxppbtEK1F66u3bKwU2g+wxwWI7PAoRpJnOY1grJqzHg==
+  dependencies:
+    "@types/istanbul-lib-coverage" "*"
+
+"@types/istanbul-reports@^1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-1.1.1.tgz#7a8cbf6a406f36c8add871625b278eaf0b0d255a"
+  integrity sha512-UpYjBi8xefVChsCoBpKShdxTllC9pwISirfoZsUa2AAdQg/Jd2KQGtSbw+ya7GPo7x/wAPlH6JBhKhAsXUEZNA==
+  dependencies:
+    "@types/istanbul-lib-coverage" "*"
+    "@types/istanbul-lib-report" "*"
+
 "@types/sizzle@2.3.2":
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/@types/sizzle/-/sizzle-2.3.2.tgz#a811b8c18e2babab7d542b3365887ae2e4d9de47"
   integrity sha512-7EJYyKTL7tFR8+gDbB6Wwz/arpGa0Mywk1TJbNzKzHtzbwVmY4HR9WqS5VV7dsBUKQmPNr192jHr/VpBluj/hg==
 
+"@types/stack-utils@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e"
+  integrity sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==
+
+"@types/yargs-parser@*":
+  version "13.1.0"
+  resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-13.1.0.tgz#c563aa192f39350a1d18da36c5a8da382bbd8228"
+  integrity sha512-gCubfBUZ6KxzoibJ+SCUc/57Ms1jz5NjHe4+dI2krNmU5zCPAphyLJYyTOg06ueIyfj+SaCUqmzun7ImlxDcKg==
+
+"@types/yargs@^13.0.0":
+  version "13.0.3"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-13.0.3.tgz#76482af3981d4412d65371a318f992d33464a380"
+  integrity sha512-K8/LfZq2duW33XW/tFwEAfnZlqIfVsoyRB3kfXdPXYhl0nfM8mmh7GS0jg7WrX2Dgq/0Ha/pR1PaR+BvmWwjiQ==
+  dependencies:
+    "@types/yargs-parser" "*"
+
 JSONStream@^1.0.3:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz#3208c1f08d3a4d99261ab64f92302bc15e111ca0"
@@ -971,12 +1683,17 @@ ansi-regex@^3.0.0:
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
   integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
 
+ansi-regex@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
+  integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
+
 ansi-styles@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
   integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=
 
-ansi-styles@^3.2.1:
+ansi-styles@^3.2.0, ansi-styles@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
   integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
@@ -1106,6 +1823,15 @@ assertion-error-formatter@^2.0.1:
     pad-right "^0.2.2"
     repeat-string "^1.6.1"
 
+assertion-error-formatter@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/assertion-error-formatter/-/assertion-error-formatter-3.0.0.tgz#be9c8825dee6a8a6c72183d915912d9b57d5d265"
+  integrity sha512-6YyAVLrEze0kQ7CmJfUgrLHb+Y7XghmL2Ie7ijVa2Y9ynP3LV+VDiwFk62Dn0qtqbmY0BT0ss6p1xxpiF2PYbQ==
+  dependencies:
+    diff "^4.0.1"
+    pad-right "^0.2.2"
+    repeat-string "^1.6.1"
+
 assertion-error@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.1.0.tgz#e60b6b0e8f301bd97e5375215bda406c85118c0b"
@@ -1224,7 +1950,7 @@ bcryptjs@^2.4.3:
   resolved "https://registry.yarnpkg.com/bcryptjs/-/bcryptjs-2.4.3.tgz#9ab5627b93e60621ff7cdac5da9733027df1d0cb"
   integrity sha1-mrVie5PmBiH/fNrF2pczAn3x0Ms=
 
-becke-ch--regex--s0-0-v1--base--pl--lib@^1.2.0:
+becke-ch--regex--s0-0-v1--base--pl--lib@^1.2.0, becke-ch--regex--s0-0-v1--base--pl--lib@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/becke-ch--regex--s0-0-v1--base--pl--lib/-/becke-ch--regex--s0-0-v1--base--pl--lib-1.4.0.tgz#429ceebbfa5f7e936e78d73fbdc7da7162b20e20"
   integrity sha1-Qpzuu/pffpNueNc/vcfacWKyDiA=
@@ -1474,6 +2200,11 @@ cachedir@1.3.0:
   dependencies:
     os-homedir "^1.0.1"
 
+callsites@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
+  integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
+
 caniuse-lite@^1.0.30000984:
   version "1.0.30000989"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000989.tgz#b9193e293ccf7e4426c5245134b8f2a56c0ac4b9"
@@ -1593,6 +2324,16 @@ cli-spinners@^0.1.2:
   resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-0.1.2.tgz#bb764d88e185fb9e1e6a2a1f19772318f605e31c"
   integrity sha1-u3ZNiOGF+54eaiofGXcjGPYF4xw=
 
+cli-table3@^0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.5.1.tgz#0252372d94dfc40dbd8df06005f48f31f656f202"
+  integrity sha512-7Qg2Jrep1S/+Q3EceiZtQcDPWxhAvBw+ERf1162v4sikJrvojMHFqXt8QIVha8UlH9rgU0BeWPytZ9/TzYqlUw==
+  dependencies:
+    object-assign "^4.1.0"
+    string-width "^2.1.1"
+  optionalDependencies:
+    colors "^1.1.2"
+
 cli-table@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/cli-table/-/cli-table-0.3.1.tgz#f53b05266a8b1a0b934b3d0821e6e2dc5914ae23"
@@ -1716,6 +2457,11 @@ common-tags@1.8.0:
   resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.0.tgz#8e3153e542d4a39e9b10554434afaaf98956a937"
   integrity sha512-6P6g0uetGpW/sdyUy/iQQCbFF0kWVMSIVSyYz7Zgjcgh8mgw8PQzDNZeyZ5DQ2gM7LBoZPHmnjz8rUthkBG5tw==
 
+commondir@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
+  integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=
+
 component-emitter@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
@@ -1760,6 +2506,13 @@ convert-source-map@^1.1.0, convert-source-map@^1.3.0:
   dependencies:
     safe-buffer "~5.1.1"
 
+convert-source-map@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442"
+  integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==
+  dependencies:
+    safe-buffer "~5.1.1"
+
 convert-source-map@~1.1.0:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.1.3.tgz#4829c877e9fe49b3161f3bf3673888e204699860"
@@ -1783,6 +2536,11 @@ core-js@^2.4.0:
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.5.tgz#44bc8d249e7fb2ff5d00e0341a7ffb94fbf67895"
   integrity sha512-klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A==
 
+core-js@^2.6.5:
+  version "2.6.10"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.10.tgz#8a5b8391f8cc7013da703411ce5b585706300d7f"
+  integrity sha512-I39t74+4t+zau64EN1fE5v2W31Adtc/REhzWN+gWRRXg6WH5qAsZm62DHpQ1+Yhe4047T55jvzz7MUqF/dBBlA==
+
 core-js@^3.2.1:
   version "3.3.3"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.3.3.tgz#b7048d3c6c1a52b5fe55a729c1d4ccdffe0891bb"
@@ -1900,11 +2658,24 @@ cucumber-expressions@^6.0.1:
   dependencies:
     becke-ch--regex--s0-0-v1--base--pl--lib "^1.2.0"
 
+cucumber-expressions@^8.1.0:
+  version "8.2.1"
+  resolved "https://registry.yarnpkg.com/cucumber-expressions/-/cucumber-expressions-8.2.1.tgz#e250063993350df106a8664c90a414814f555e2d"
+  integrity sha512-6n5JKbAzXfIiwyu2UyUcOmO83QmuSme25+Dw2taK6VNOybOfRkh4yNMA9VtuAJHOmsX3/8l0OVjTbE8lHnjOHA==
+  dependencies:
+    becke-ch--regex--s0-0-v1--base--pl--lib "^1.4.0"
+    xregexp "^4.2.4"
+
 cucumber-tag-expressions@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/cucumber-tag-expressions/-/cucumber-tag-expressions-1.1.1.tgz#7f5c7b70009bc2b666591bfe64854578bedee85a"
   integrity sha1-f1x7cACbwrZmWRv+ZIVFeL7e6Fo=
 
+cucumber-tag-expressions@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/cucumber-tag-expressions/-/cucumber-tag-expressions-2.0.2.tgz#aac27aae3690818ec15235bd056282dad8a2d2b8"
+  integrity sha512-DohmT4X641KX/sb96bdb7J2kXNcQBPrYmf3Oc5kiHCLfzFMWx/o2kB4JvjvQPZnYuA9lRt6pqtArM5gvUn4uzw==
+
 cucumber@^4.2.1:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/cucumber/-/cucumber-4.2.1.tgz#64cfff6150bbe6b5e94b173470057353d6206719"
@@ -1939,6 +2710,39 @@ cucumber@^4.2.1:
     util-arity "^1.0.2"
     verror "^1.9.0"
 
+cucumber@^6.0.5:
+  version "6.0.5"
+  resolved "https://registry.yarnpkg.com/cucumber/-/cucumber-6.0.5.tgz#cdc752ad18b551bcf7bc92774c925302f4408714"
+  integrity sha512-x+W9Fwk6TvcapQsYMxwFU5AsQJDOIJVGrPKmH15OC7jzb9/Dk7Hb0ZAyw4WcpaDcUDRc8bi2k2yJejDp5eTRlg==
+  dependencies:
+    assertion-error-formatter "^3.0.0"
+    bluebird "^3.4.1"
+    cli-table3 "^0.5.1"
+    colors "^1.1.2"
+    commander "^3.0.1"
+    cucumber-expressions "^8.1.0"
+    cucumber-tag-expressions "^2.0.2"
+    duration "^0.2.1"
+    escape-string-regexp "^2.0.0"
+    figures "^3.0.0"
+    gherkin "5.0.0"
+    glob "^7.1.3"
+    indent-string "^4.0.0"
+    is-generator "^1.0.2"
+    is-stream "^2.0.0"
+    knuth-shuffle-seeded "^1.0.6"
+    lodash "^4.17.14"
+    mz "^2.4.0"
+    progress "^2.0.0"
+    resolve "^1.3.3"
+    serialize-error "^4.1.0"
+    stack-chain "^2.0.0"
+    stacktrace-js "^2.0.0"
+    string-argv "^0.3.0"
+    title-case "^2.1.1"
+    util-arity "^1.0.2"
+    verror "^1.9.0"
+
 cypress-cucumber-preprocessor@^1.17.0:
   version "1.17.0"
   resolved "https://registry.yarnpkg.com/cypress-cucumber-preprocessor/-/cypress-cucumber-preprocessor-1.17.0.tgz#c0f60f1e4b408300bd46acbf0be29d791b299771"
@@ -2155,11 +2959,21 @@ detective@^5.0.2:
     defined "^1.0.0"
     minimist "^1.1.1"
 
+diff-sequences@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-24.9.0.tgz#5715d6244e2aa65f48bba0bc972db0b0b11e95b5"
+  integrity sha512-Dj6Wk3tWyTE+Fo1rW8v0Xhwk80um6yFYKbuAxc9c3EZxIHFDYwbi34Uk42u1CdnIiVorvt4RmlSDjIPyzGC2ew==
+
 diff@^3.0.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
   integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==
 
+diff@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.1.tgz#0c667cb467ebbb5cea7f14f135cc2dba7780a8ff"
+  integrity sha512-s2+XdvhPCOF01LRQBC8hf4vhbVmI2CGS5aZnxLJlT5FtdhPCDFq80q++zK2KlrVorVDdL5BOGZ/VfLrVtYNF+Q==
+
 diffie-hellman@^5.0.0:
   version "5.0.3"
   resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875"
@@ -2191,7 +3005,7 @@ duplexer2@^0.1.2, duplexer2@~0.1.0, duplexer2@~0.1.2:
   dependencies:
     readable-stream "^2.0.2"
 
-duration@^0.2.0:
+duration@^0.2.0, duration@^0.2.1:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/duration/-/duration-0.2.2.tgz#ddf149bc3bc6901150fe9017111d016b3357f529"
   integrity sha512-06kgtea+bGreF5eKYgI/36A6pLXggY7oR4p1pq4SmdFBn1ReOL5D8RhG64VrqfTTKNucqqtBAwEj8aB88mcqrg==
@@ -2308,6 +3122,11 @@ escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
   integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
 
+escape-string-regexp@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344"
+  integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==
+
 esprima@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
@@ -2369,6 +3188,18 @@ expand-brackets@^2.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
+expect@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/expect/-/expect-24.9.0.tgz#b75165b4817074fa4a157794f46fe9f1ba15b6ca"
+  integrity sha512-wvVAx8XIol3Z5m9zvZXiyZOQ+sRJqNTIm6sGjdWlaZIeupQGO3WbYI+15D/AmEwZywL6wtJkbAbJtzkOfBuR0Q==
+  dependencies:
+    "@jest/types" "^24.9.0"
+    ansi-styles "^3.2.0"
+    jest-get-type "^24.9.0"
+    jest-matcher-utils "^24.9.0"
+    jest-message-util "^24.9.0"
+    jest-regex-util "^24.9.0"
+
 extend-shallow@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
@@ -2466,6 +3297,13 @@ figures@^1.7.0:
     escape-string-regexp "^1.0.5"
     object-assign "^4.1.0"
 
+figures@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/figures/-/figures-3.1.0.tgz#4b198dd07d8d71530642864af2d45dd9e459c4ec"
+  integrity sha512-ravh8VRXqHuMvZt/d8GblBeqDMkdJMBdv/2KntFH+ra5MXkO7nxNKpzQ3n6QD/2da1kH0aWmNISdvhM7gl2gVg==
+  dependencies:
+    escape-string-regexp "^1.0.5"
+
 fill-range@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
@@ -2476,6 +3314,22 @@ fill-range@^4.0.0:
     repeat-string "^1.6.1"
     to-regex-range "^2.1.0"
 
+find-cache-dir@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7"
+  integrity sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==
+  dependencies:
+    commondir "^1.0.1"
+    make-dir "^2.0.0"
+    pkg-dir "^3.0.0"
+
+find-up@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
+  integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==
+  dependencies:
+    locate-path "^3.0.0"
+
 for-in@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
@@ -2593,6 +3447,11 @@ getpass@^0.1.1:
   dependencies:
     assert-plus "^1.0.0"
 
+gherkin@5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/gherkin/-/gherkin-5.0.0.tgz#96def41198ec3908258b511af74f655a2764d2a1"
+  integrity sha1-lt70EZjsOQgli1Ea909lWidk0qE=
+
 gherkin@^5.0.0, gherkin@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/gherkin/-/gherkin-5.1.0.tgz#684bbb03add24eaf7bdf544f58033eb28fb3c6d5"
@@ -2635,6 +3494,11 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6:
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
   integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==
 
+graceful-fs@^4.1.15:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423"
+  integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==
+
 graphql-request@^1.8.2:
   version "1.8.2"
   resolved "https://registry.yarnpkg.com/graphql-request/-/graphql-request-1.8.2.tgz#398d10ae15c585676741bde3fc01d5ca948f8fbe"
@@ -2819,6 +3683,11 @@ indent-string@^3.0.0, indent-string@^3.1.0:
   resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-3.2.0.tgz#4a5fd6d27cc332f37e5419a504dbb837105c9289"
   integrity sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=
 
+indent-string@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
+  integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
+
 inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
@@ -3058,6 +3927,11 @@ is-stream@^1.1.0:
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
   integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
 
+is-stream@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3"
+  integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==
+
 is-symbol@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.2.tgz#a055f6ae57192caee329e7a860118b497a950f38"
@@ -3107,6 +3981,50 @@ isstream@~0.1.2:
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
   integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
 
+jest-diff@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-24.9.0.tgz#931b7d0d5778a1baf7452cb816e325e3724055da"
+  integrity sha512-qMfrTs8AdJE2iqrTp0hzh7kTd2PQWrsFyj9tORoKmu32xjPjeE4NyjVRDz8ybYwqS2ik8N4hsIpiVTyFeo2lBQ==
+  dependencies:
+    chalk "^2.0.1"
+    diff-sequences "^24.9.0"
+    jest-get-type "^24.9.0"
+    pretty-format "^24.9.0"
+
+jest-get-type@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-24.9.0.tgz#1684a0c8a50f2e4901b6644ae861f579eed2ef0e"
+  integrity sha512-lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q==
+
+jest-matcher-utils@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-24.9.0.tgz#f5b3661d5e628dffe6dd65251dfdae0e87c3a073"
+  integrity sha512-OZz2IXsu6eaiMAwe67c1T+5tUAtQyQx27/EMEkbFAGiw52tB9em+uGbzpcgYVpA8wl0hlxKPZxrly4CXU/GjHA==
+  dependencies:
+    chalk "^2.0.1"
+    jest-diff "^24.9.0"
+    jest-get-type "^24.9.0"
+    pretty-format "^24.9.0"
+
+jest-message-util@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-24.9.0.tgz#527f54a1e380f5e202a8d1149b0ec872f43119e3"
+  integrity sha512-oCj8FiZ3U0hTP4aSui87P4L4jC37BtQwUMqk+zk/b11FR19BJDeZsZAvIHutWnmtw7r85UmR3CEWZ0HWU2mAlw==
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    "@jest/test-result" "^24.9.0"
+    "@jest/types" "^24.9.0"
+    "@types/stack-utils" "^1.0.1"
+    chalk "^2.0.1"
+    micromatch "^3.1.10"
+    slash "^2.0.0"
+    stack-utils "^1.0.1"
+
+jest-regex-util@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-24.9.0.tgz#c13fb3380bde22bf6575432c493ea8fe37965636"
+  integrity sha512-05Cmb6CuxaA+Ys6fjr3PhvV3bGQmO+2p2La4hFbU+W5uOc479f7FdLXUWXw4pYMAhhSZIuKHwSXSu6CsSBAXQA==
+
 js-levenshtein@^1.1.3:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/js-levenshtein/-/js-levenshtein-1.1.6.tgz#c6cee58eb3550372df8deb85fad5ce66ce01d59d"
@@ -3312,6 +4230,14 @@ load-json-file@^4.0.0:
     pify "^3.0.0"
     strip-bom "^3.0.0"
 
+locate-path@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
+  integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==
+  dependencies:
+    p-locate "^3.0.0"
+    path-exists "^3.0.0"
+
 lodash.clonedeep@4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
@@ -3332,7 +4258,7 @@ lodash.uniqby@^4.7.0:
   resolved "https://registry.yarnpkg.com/lodash.uniqby/-/lodash.uniqby-4.7.0.tgz#d99c07a669e9e6d24e1362dfe266c67616af1302"
   integrity sha1-2ZwHpmnp5tJOE2Lf4mbGdhavEwI=
 
-lodash@4.17.15, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.4:
+lodash@4.17.15, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.4:
   version "4.17.15"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
   integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
@@ -3371,6 +4297,14 @@ lower-case@^1.1.1:
   resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"
   integrity sha1-miyr0bno4K6ZOkv31YdcOcQujqw=
 
+make-dir@^2.0.0, make-dir@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
+  integrity sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==
+  dependencies:
+    pify "^4.0.1"
+    semver "^5.6.0"
+
 map-cache@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
@@ -3625,6 +4559,11 @@ node-fetch@^2.2.0, node-fetch@^2.6.0:
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd"
   integrity sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==
 
+node-modules-regexp@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz#8d9dbe28964a4ac5712e9131642107c71e90ec40"
+  integrity sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA=
+
 node-pre-gyp@^0.10.0:
   version "0.10.3"
   resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz#3070040716afdc778747b61b6887bf78880b80fc"
@@ -3846,11 +4785,30 @@ p-finally@^1.0.0:
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
   integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
 
+p-limit@^2.0.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.1.tgz#aa07a788cc3151c939b5131f63570f0dd2009537"
+  integrity sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==
+  dependencies:
+    p-try "^2.0.0"
+
+p-locate@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
+  integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==
+  dependencies:
+    p-limit "^2.0.0"
+
 p-map@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b"
   integrity sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==
 
+p-try@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
+  integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
+
 pad-right@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/pad-right/-/pad-right-0.2.2.tgz#6fbc924045d244f2a2a244503060d3bfc6009774"
@@ -3910,6 +4868,11 @@ path-dirname@^1.0.0:
   resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
   integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=
 
+path-exists@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
+  integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=
+
 path-is-absolute@^1.0.0, path-is-absolute@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
@@ -3988,11 +4951,40 @@ pify@^3.0.0:
   resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
   integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=
 
+pify@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231"
+  integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==
+
+pirates@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.1.tgz#643a92caf894566f91b2b986d2c66950a8e2fb87"
+  integrity sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA==
+  dependencies:
+    node-modules-regexp "^1.0.0"
+
+pkg-dir@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3"
+  integrity sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==
+  dependencies:
+    find-up "^3.0.0"
+
 posix-character-classes@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
   integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
 
+pretty-format@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-24.9.0.tgz#12fac31b37019a4eea3c11aa9a959eb7628aa7c9"
+  integrity sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==
+  dependencies:
+    "@jest/types" "^24.9.0"
+    ansi-regex "^4.0.0"
+    ansi-styles "^3.2.0"
+    react-is "^16.8.4"
+
 private@^0.1.6:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
@@ -4090,6 +5082,11 @@ rc@^1.2.7:
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
+react-is@^16.8.4:
+  version "16.12.0"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.12.0.tgz#2cc0fe0fba742d97fd527c42a13bec4eeb06241c"
+  integrity sha512-rPCkf/mWBtKc97aLL9/txD8DZdemK0vkA3JMLShjlJB3Pj3s+lpf1KaBzMfQrAmhMQB0n1cU/SUGgKKBCe837Q==
+
 read-only-stream@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/read-only-stream/-/read-only-stream-2.0.0.tgz#2724fd6a8113d73764ac288d4386270c1dbf17f0"
@@ -4135,6 +5132,13 @@ regenerate-unicode-properties@^8.0.2:
   dependencies:
     regenerate "^1.4.0"
 
+regenerate-unicode-properties@^8.1.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.1.0.tgz#ef51e0f0ea4ad424b77bf7cb41f3e015c70a3f0e"
+  integrity sha512-LGZzkgtLY79GeXLm8Dp0BVLdQlWICzBnJz/ipWUgo59qBaZ+BHtq51P2q1uVZlppMuUAT37SDk39qUbjTWB7bA==
+  dependencies:
+    regenerate "^1.4.0"
+
 regenerate@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11"
@@ -4187,6 +5191,18 @@ regexpu-core@^4.5.4:
     unicode-match-property-ecmascript "^1.0.4"
     unicode-match-property-value-ecmascript "^1.1.0"
 
+regexpu-core@^4.6.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.6.0.tgz#2037c18b327cfce8a6fea2a4ec441f2432afb8b6"
+  integrity sha512-YlVaefl8P5BnFYOITTNzDvan1ulLOiXJzCNZxduTIosN17b87h3bvG9yHMoHaRuo88H4mQ06Aodj5VtYGGGiTg==
+  dependencies:
+    regenerate "^1.4.0"
+    regenerate-unicode-properties "^8.1.0"
+    regjsgen "^0.5.0"
+    regjsparser "^0.6.0"
+    unicode-match-property-ecmascript "^1.0.4"
+    unicode-match-property-value-ecmascript "^1.1.0"
+
 regjsgen@^0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.0.tgz#a7634dc08f89209c2049adda3525711fb97265dd"
@@ -4343,6 +5359,11 @@ seed-random@~2.2.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b"
   integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==
 
+semver@^5.6.0:
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
+  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
+
 semver@^6.3.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
@@ -4353,6 +5374,13 @@ serialize-error@^2.1.0:
   resolved "https://registry.yarnpkg.com/serialize-error/-/serialize-error-2.1.0.tgz#50b679d5635cdf84667bdc8e59af4e5b81d5f60a"
   integrity sha1-ULZ51WNc34Rme9yOWa9OW4HV9go=
 
+serialize-error@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/serialize-error/-/serialize-error-4.1.0.tgz#63e1e33ede20bcd89d9f0528ea4c15fbf0f2b78a"
+  integrity sha512-5j9GgyGsP9vV9Uj1S0lDCvlsd+gc2LEPVK7HHHte7IyPwOD4lVQFeaX143gx3U5AnoCi+wbcb3mvaxVysjpxEw==
+  dependencies:
+    type-fest "^0.3.0"
+
 set-blocking@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
@@ -4416,6 +5444,11 @@ simple-concat@^1.0.0:
   resolved "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.0.tgz#7344cbb8b6e26fb27d66b2fc86f9f6d5997521c6"
   integrity sha1-c0TLuLbib7J9ZrL8hvn21Zl1IcY=
 
+slash@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"
+  integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==
+
 slice-ansi@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz#edbf8903f66f7ce2f8eafd6ceed65e264c831b35"
@@ -4469,6 +5502,14 @@ source-map-resolve@^0.5.0:
     source-map-url "^0.4.0"
     urix "^0.1.0"
 
+source-map-support@^0.5.16:
+  version "0.5.16"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.16.tgz#0ae069e7fe3ba7538c64c98515e35339eac5a042"
+  integrity sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ==
+  dependencies:
+    buffer-from "^1.0.0"
+    source-map "^0.6.0"
+
 source-map-url@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
@@ -4484,7 +5525,7 @@ source-map@^0.5.0, source-map@^0.5.6, source-map@~0.5.3:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
   integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
 
-source-map@^0.6.1, source-map@~0.6.1:
+source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
@@ -4554,6 +5595,11 @@ stack-generator@^2.0.1:
   dependencies:
     stackframe "^1.0.4"
 
+stack-utils@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.2.tgz#33eba3897788558bebfc2db059dc158ec36cebb8"
+  integrity sha512-MTX+MeG5U994cazkjd/9KNAapsHnibjMLnfXodlkXw76JEea0UiNzrqidzo1emMwk7w5Qhc9jd4Bn9TBb1MFwA==
+
 stackframe@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-1.0.4.tgz#357b24a992f9427cba6b545d96a14ed2cbca187b"
@@ -4629,6 +5675,11 @@ string-argv@0.0.2:
   resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.0.2.tgz#dac30408690c21f3c3630a3ff3a05877bdcbd736"
   integrity sha1-2sMECGkMIfPDYwo/86BYd73L1zY=
 
+string-argv@^0.3.0:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.3.1.tgz#95e2fbec0427ae19184935f816d74aaa4c5c19da"
+  integrity sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg==
+
 string-width@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
@@ -4638,7 +5689,7 @@ string-width@^1.0.1:
     is-fullwidth-code-point "^1.0.0"
     strip-ansi "^3.0.0"
 
-"string-width@^1.0.2 || 2":
+"string-width@^1.0.2 || 2", string-width@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
   integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
@@ -4887,6 +5938,11 @@ type-detect@^4.0.0, type-detect@^4.0.5:
   resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
   integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==
 
+type-fest@^0.3.0:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.3.1.tgz#63d00d204e059474fe5e1b7c011112bbd1dc29e1"
+  integrity sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ==
+
 typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
@@ -5105,6 +6161,13 @@ wrappy@1:
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
+xregexp@^4.2.4:
+  version "4.2.4"
+  resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.2.4.tgz#02a4aea056d65a42632c02f0233eab8e4d7e57ed"
+  integrity sha512-sO0bYdYeJAJBcJA8g7MJJX7UrOZIfJPd8U2SC7B2Dd/J24U0aQNoGp33shCaBSWeb0rD5rh6VBUIXOkGal1TZA==
+  dependencies:
+    "@babel/runtime-corejs2" "^7.2.0"
+
 xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"

From 132c12a7d3b24db62c4bb1816a890c76edc29425 Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Mon, 2 Dec 2019 18:11:25 +0100
Subject: [PATCH 140/174] Close neo4j driver sessions

We had this error in our neo4j pod recently:

```
2019-12-02 08:29:42.680+0000 ERROR Unable to schedule bolt session 'bolt-1018230' for execution since there are no available threads to serve it at the moment. You can retry at a later time or consider increasing max thread pool size for bolt connector(s).
2019-12-02 08:29:42.680+0000 ERROR Unable to schedule bolt session 'bolt-1018224' for execution since there are no available threads to serve it at the moment. You can retry at a later time or consider increasing max thread pool size for bolt connector(s).
2019-12-02 08:29:42.681+0000 ERROR Unable to schedule bolt session 'bolt-1018352' for execution since there are no available threads to serve it at the moment. You can retry at a later time or consider increasing max thread pool size for bolt connector(s).
2019-12-02 08:29:42.682+0000 ERROR Unable to schedule bolt session 'bolt-1018243' for execution since there are no available threads to serve it at the moment. You can retry at a later time or consider increasing max thread pool size for bolt connector(s).
```

Apparently the default is 400 threads. So we must have a leak somewhere.
---
 backend/src/jwt/decode.js                     |  12 +-
 .../middleware/hashtags/hashtagsMiddleware.js |  21 +-
 .../notifications/notificationsMiddleware.js  |  45 ++--
 .../src/middleware/permissionsMiddleware.js   |   2 +-
 backend/src/middleware/sluggifyMiddleware.js  |  13 +-
 .../validation/validationMiddleware.js        |  64 +++---
 backend/src/schema/resolvers/comments.js      |  51 +++--
 backend/src/schema/resolvers/donations.js     |   2 +-
 .../resolvers/helpers/createPasswordReset.js  |   4 +-
 backend/src/schema/resolvers/moderation.js    |  34 +--
 backend/src/schema/resolvers/notifications.js |  13 +-
 backend/src/schema/resolvers/passwordReset.js |  25 ++-
 .../schema/resolvers/passwordReset.spec.js    |  11 +-
 backend/src/schema/resolvers/posts.js         | 195 +++++++++---------
 backend/src/schema/resolvers/reports.js       |  40 ++--
 backend/src/schema/resolvers/shout.js         |  61 +++---
 backend/src/schema/resolvers/statistics.js    |   2 +-
 .../src/schema/resolvers/user_management.js   |  41 ++--
 backend/src/seed/factories/index.js           |   2 +-
 19 files changed, 350 insertions(+), 288 deletions(-)

diff --git a/backend/src/jwt/decode.js b/backend/src/jwt/decode.js
index 842f8f537..5b7881d20 100644
--- a/backend/src/jwt/decode.js
+++ b/backend/src/jwt/decode.js
@@ -11,15 +11,21 @@ export default async (driver, authorizationHeader) => {
   } catch (err) {
     return null
   }
-  const session = driver.session()
   const query = `
     MATCH (user:User {id: $id, deleted: false, disabled: false })
     SET user.lastActiveAt = toString(datetime())
     RETURN user {.id, .slug, .name, .avatar, .email, .role, .disabled, .actorId}
     LIMIT 1
   `
-  const result = await session.run(query, { id })
-  session.close()
+  const session = driver.session()
+  let result
+
+  try {
+    result = await session.run(query, { id })
+  } finally {
+    session.close()
+  }
+
   const [currentUser] = await result.records.map(record => {
     return record.get('user')
   })
diff --git a/backend/src/middleware/hashtags/hashtagsMiddleware.js b/backend/src/middleware/hashtags/hashtagsMiddleware.js
index c9156398d..53a8fed20 100644
--- a/backend/src/middleware/hashtags/hashtagsMiddleware.js
+++ b/backend/src/middleware/hashtags/hashtagsMiddleware.js
@@ -3,7 +3,6 @@ import extractHashtags from '../hashtags/extractHashtags'
 const updateHashtagsOfPost = async (postId, hashtags, context) => {
   if (!hashtags.length) return
 
-  const session = context.driver.session()
   // We need two Cypher statements, because the 'MATCH' in the 'cypherDeletePreviousRelations' statement
   //  functions as an 'if'. In case there is no previous relation, the rest of the commands are omitted
   //  and no new Hashtags and relations will be created.
@@ -19,14 +18,18 @@ const updateHashtagsOfPost = async (postId, hashtags, context) => {
     MERGE (p)-[:TAGGED]->(t)
     RETURN p, t
     `
-  await session.run(cypherDeletePreviousRelations, {
-    postId,
-  })
-  await session.run(cypherCreateNewTagsAndRelations, {
-    postId,
-    hashtags,
-  })
-  session.close()
+  const session = context.driver.session()
+  try {
+    await session.run(cypherDeletePreviousRelations, {
+      postId,
+    })
+    await session.run(cypherCreateNewTagsAndRelations, {
+      postId,
+      hashtags,
+    })
+  } finally {
+    session.close()
+  }
 }
 
 const handleContentDataOfPost = async (resolve, root, args, context, resolveInfo) => {
diff --git a/backend/src/middleware/notifications/notificationsMiddleware.js b/backend/src/middleware/notifications/notificationsMiddleware.js
index 718f0b1e4..ac199a67d 100644
--- a/backend/src/middleware/notifications/notificationsMiddleware.js
+++ b/backend/src/middleware/notifications/notificationsMiddleware.js
@@ -1,15 +1,19 @@
 import extractMentionedUsers from './mentions/extractMentionedUsers'
 
 const postAuthorOfComment = async (comment, { context }) => {
-  const session = context.driver.session()
   const cypherFindUser = `
     MATCH (user: User)-[:WROTE]->(:Post)<-[:COMMENTS]-(:Comment { id: $commentId })
     RETURN user { .id }
     `
-  const result = await session.run(cypherFindUser, {
-    commentId: comment.id,
-  })
-  session.close()
+  const session = context.driver.session()
+  let result
+  try {
+    result = await session.run(cypherFindUser, {
+      commentId: comment.id,
+    })
+  } finally {
+    session.close()
+  }
   const [postAuthor] = await result.records.map(record => {
     return record.get('user')
   })
@@ -31,7 +35,6 @@ const notifyUsers = async (label, id, idsOfUsers, reason, context) => {
     throw new Error('Notification does not fit the reason!')
   }
 
-  const session = context.driver.session()
   let cypher
   switch (reason) {
     case 'mentioned_in_post': {
@@ -85,12 +88,16 @@ const notifyUsers = async (label, id, idsOfUsers, reason, context) => {
       break
     }
   }
-  await session.run(cypher, {
-    id,
-    idsOfUsers,
-    reason,
-  })
-  session.close()
+  const session = context.driver.session()
+  try {
+    await session.run(cypher, {
+      id,
+      idsOfUsers,
+      reason,
+    })
+  } finally {
+    session.close()
+  }
 }
 
 const handleContentDataOfPost = async (resolve, root, args, context, resolveInfo) => {
@@ -123,15 +130,19 @@ const handleCreateComment = async (resolve, root, args, context, resolveInfo) =>
   const comment = await handleContentDataOfComment(resolve, root, args, context, resolveInfo)
 
   if (comment) {
-    const session = context.driver.session()
     const cypherFindUser = `
     MATCH (user: User)-[:WROTE]->(:Post)<-[:COMMENTS]-(:Comment { id: $commentId })
     RETURN user { .id }
     `
-    const result = await session.run(cypherFindUser, {
-      commentId: comment.id,
-    })
-    session.close()
+    const session = context.driver.session()
+    let result
+    try {
+      result = await session.run(cypherFindUser, {
+        commentId: comment.id,
+      })
+    } finally {
+      session.close()
+    }
     const [postAuthor] = await result.records.map(record => {
       return record.get('user')
     })
diff --git a/backend/src/middleware/permissionsMiddleware.js b/backend/src/middleware/permissionsMiddleware.js
index e729123c9..f3c8ca65e 100644
--- a/backend/src/middleware/permissionsMiddleware.js
+++ b/backend/src/middleware/permissionsMiddleware.js
@@ -45,8 +45,8 @@ const isAuthor = rule({
   cache: 'no_cache',
 })(async (_parent, args, { user, driver }) => {
   if (!user) return false
-  const session = driver.session()
   const { id: resourceId } = args
+  const session = driver.session()
   try {
     const result = await session.run(
       `
diff --git a/backend/src/middleware/sluggifyMiddleware.js b/backend/src/middleware/sluggifyMiddleware.js
index fed9b4da7..cda3fd335 100644
--- a/backend/src/middleware/sluggifyMiddleware.js
+++ b/backend/src/middleware/sluggifyMiddleware.js
@@ -3,11 +3,14 @@ import uniqueSlug from './slugify/uniqueSlug'
 const isUniqueFor = (context, type) => {
   return async slug => {
     const session = context.driver.session()
-    const response = await session.run(`MATCH(p:${type} {slug: $slug }) return p.slug`, {
-      slug,
-    })
-    session.close()
-    return response.records.length === 0
+    try {
+      const response = await session.run(`MATCH(p:${type} {slug: $slug }) return p.slug`, {
+        slug,
+      })
+      return response.records.length === 0
+    } finally {
+      session.close()
+    }
   }
 }
 
diff --git a/backend/src/middleware/validation/validationMiddleware.js b/backend/src/middleware/validation/validationMiddleware.js
index bd4805ed8..024e594bf 100644
--- a/backend/src/middleware/validation/validationMiddleware.js
+++ b/backend/src/middleware/validation/validationMiddleware.js
@@ -13,23 +13,26 @@ const validateCommentCreation = async (resolve, root, args, context, info) => {
     throw new UserInputError(`Comment must be at least ${COMMENT_MIN_LENGTH} character long!`)
   }
   const session = context.driver.session()
-  const postQueryRes = await session.run(
-    `
+  try {
+    const postQueryRes = await session.run(
+      `
     MATCH (post:Post {id: $postId})
     RETURN post`,
-    {
-      postId,
-    },
-  )
-  session.close()
-  const [post] = postQueryRes.records.map(record => {
-    return record.get('post')
-  })
+      {
+        postId,
+      },
+    )
+    const [post] = postQueryRes.records.map(record => {
+      return record.get('post')
+    })
 
-  if (!post) {
-    throw new UserInputError(NO_POST_ERR_MESSAGE)
-  } else {
-    return resolve(root, args, context, info)
+    if (!post) {
+      throw new UserInputError(NO_POST_ERR_MESSAGE)
+    } else {
+      return resolve(root, args, context, info)
+    }
+  } finally {
+    session.close()
   }
 }
 
@@ -62,25 +65,28 @@ const validateReport = async (resolve, root, args, context, info) => {
   const { user, driver } = context
   if (resourceId === user.id) throw new Error('You cannot report yourself!')
   const session = driver.session()
-  const reportQueryRes = await session.run(
-    `
+  try {
+    const reportQueryRes = await session.run(
+      `
       MATCH (:User {id:$submitterId})-[:REPORTED]->(resource {id:$resourceId}) 
       RETURN labels(resource)[0] as label
     `,
-    {
-      resourceId,
-      submitterId: user.id,
-    },
-  )
-  session.close()
-  const [existingReportedResource] = reportQueryRes.records.map(record => {
-    return {
-      label: record.get('label'),
-    }
-  })
+      {
+        resourceId,
+        submitterId: user.id,
+      },
+    )
+    const [existingReportedResource] = reportQueryRes.records.map(record => {
+      return {
+        label: record.get('label'),
+      }
+    })
 
-  if (existingReportedResource) throw new Error(`${existingReportedResource.label}`)
-  return resolve(root, args, context, info)
+    if (existingReportedResource) throw new Error(`${existingReportedResource.label}`)
+    return resolve(root, args, context, info)
+  } finally {
+    session.close()
+  }
 }
 
 export default {
diff --git a/backend/src/schema/resolvers/comments.js b/backend/src/schema/resolvers/comments.js
index e0b69b153..20869a73a 100644
--- a/backend/src/schema/resolvers/comments.js
+++ b/backend/src/schema/resolvers/comments.js
@@ -13,7 +13,8 @@ export default {
       params.id = params.id || uuid()
 
       const session = context.driver.session()
-      const createCommentCypher = `
+      try {
+        const createCommentCypher = `
         MATCH (post:Post {id: $postId})
         MATCH (author:User {id: $userId})
         WITH post, author
@@ -23,45 +24,53 @@ export default {
         MERGE (post)<-[:COMMENTS]-(comment)<-[:WROTE]-(author)
         RETURN comment
       `
-      const transactionRes = await session.run(createCommentCypher, {
-        userId: context.user.id,
-        postId,
-        params,
-      })
-      session.close()
+        const transactionRes = await session.run(createCommentCypher, {
+          userId: context.user.id,
+          postId,
+          params,
+        })
 
-      const [comment] = transactionRes.records.map(record => record.get('comment').properties)
+        const [comment] = transactionRes.records.map(record => record.get('comment').properties)
 
-      return comment
+        return comment
+      } finally {
+        session.close()
+      }
     },
     UpdateComment: async (_parent, params, context, _resolveInfo) => {
       const session = context.driver.session()
-      const updateCommentCypher = `
+      try {
+        const updateCommentCypher = `
         MATCH (comment:Comment {id: $params.id})
         SET comment += $params
         SET comment.updatedAt = toString(datetime())
         RETURN comment
       `
-      const transactionRes = await session.run(updateCommentCypher, { params })
-      session.close()
-      const [comment] = transactionRes.records.map(record => record.get('comment').properties)
-      return comment
+        const transactionRes = await session.run(updateCommentCypher, { params })
+        const [comment] = transactionRes.records.map(record => record.get('comment').properties)
+        return comment
+      } finally {
+        session.close()
+      }
     },
     DeleteComment: async (_parent, args, context, _resolveInfo) => {
       const session = context.driver.session()
-      const transactionRes = await session.run(
-        `
+      try {
+        const transactionRes = await session.run(
+          `
         MATCH (comment:Comment {id: $commentId})
         SET comment.deleted        = TRUE
         SET comment.content        = 'UNAVAILABLE'
         SET comment.contentExcerpt = 'UNAVAILABLE'
         RETURN comment
       `,
-        { commentId: args.id },
-      )
-      session.close()
-      const [comment] = transactionRes.records.map(record => record.get('comment').properties)
-      return comment
+          { commentId: args.id },
+        )
+        const [comment] = transactionRes.records.map(record => record.get('comment').properties)
+        return comment
+      } finally {
+        session.close()
+      }
     },
   },
   Comment: {
diff --git a/backend/src/schema/resolvers/donations.js b/backend/src/schema/resolvers/donations.js
index 88149077d..3052ff13d 100644
--- a/backend/src/schema/resolvers/donations.js
+++ b/backend/src/schema/resolvers/donations.js
@@ -2,8 +2,8 @@ export default {
   Mutation: {
     UpdateDonations: async (_parent, params, context, _resolveInfo) => {
       const { driver } = context
-      const session = driver.session()
       let donations
+      const session = driver.session()
       const writeTxResultPromise = session.writeTransaction(async txc => {
         const updateDonationsTransactionResponse = await txc.run(
           ` 
diff --git a/backend/src/schema/resolvers/helpers/createPasswordReset.js b/backend/src/schema/resolvers/helpers/createPasswordReset.js
index d73cfaa81..41214b501 100644
--- a/backend/src/schema/resolvers/helpers/createPasswordReset.js
+++ b/backend/src/schema/resolvers/helpers/createPasswordReset.js
@@ -4,7 +4,6 @@ export default async function createPasswordReset(options) {
   const { driver, nonce, email, issuedAt = new Date() } = options
   const normalizedEmail = normalizeEmail(email)
   const session = driver.session()
-  let response = {}
   try {
     const cypher = `
       MATCH (u:User)-[:PRIMARY_EMAIL]->(e:EmailAddress {email:$email})
@@ -23,9 +22,8 @@ export default async function createPasswordReset(options) {
       const { name } = record.get('u').properties
       return { email, nonce, name }
     })
-    response = records[0] || {}
+    return records[0] || {}
   } finally {
     session.close()
   }
-  return response
 }
diff --git a/backend/src/schema/resolvers/moderation.js b/backend/src/schema/resolvers/moderation.js
index d61df7545..de756b7b2 100644
--- a/backend/src/schema/resolvers/moderation.js
+++ b/backend/src/schema/resolvers/moderation.js
@@ -12,13 +12,16 @@ export default {
       RETURN resource {.id}
       `
       const session = driver.session()
-      const res = await session.run(cypher, { id, userId })
-      session.close()
-      const [resource] = res.records.map(record => {
-        return record.get('resource')
-      })
-      if (!resource) return null
-      return resource.id
+      try {
+        const res = await session.run(cypher, { id, userId })
+        const [resource] = res.records.map(record => {
+          return record.get('resource')
+        })
+        if (!resource) return null
+        return resource.id
+      } finally {
+        session.close()
+      }
     },
     enable: async (object, params, { user, driver }) => {
       const { id } = params
@@ -29,13 +32,16 @@ export default {
       RETURN resource {.id}
       `
       const session = driver.session()
-      const res = await session.run(cypher, { id })
-      session.close()
-      const [resource] = res.records.map(record => {
-        return record.get('resource')
-      })
-      if (!resource) return null
-      return resource.id
+      try {
+        const res = await session.run(cypher, { id })
+        const [resource] = res.records.map(record => {
+          return record.get('resource')
+        })
+        if (!resource) return null
+        return resource.id
+      } finally {
+        session.close()
+      }
     },
   },
 }
diff --git a/backend/src/schema/resolvers/notifications.js b/backend/src/schema/resolvers/notifications.js
index 9e6f5c91a..7f9c52e1e 100644
--- a/backend/src/schema/resolvers/notifications.js
+++ b/backend/src/schema/resolvers/notifications.js
@@ -18,7 +18,7 @@ export default {
     notifications: async (_parent, args, context, _resolveInfo) => {
       const { user: currentUser } = context
       const session = context.driver.session()
-      let notifications, whereClause, orderByClause
+      let whereClause, orderByClause
 
       switch (args.read) {
         case true:
@@ -42,27 +42,25 @@ export default {
       }
       const offset = args.offset && typeof args.offset === 'number' ? `SKIP ${args.offset}` : ''
       const limit = args.first && typeof args.first === 'number' ? `LIMIT ${args.first}` : ''
-      try {
-        const cypher = `
+      const cypher = `
         MATCH (resource {deleted: false, disabled: false})-[notification:NOTIFIED]->(user:User {id:$id})
         ${whereClause}
         RETURN resource, notification, user
         ${orderByClause}
         ${offset} ${limit}
         `
+      try {
         const result = await session.run(cypher, { id: currentUser.id })
-        notifications = await result.records.map(transformReturnType)
+        return result.records.map(transformReturnType)
       } finally {
         session.close()
       }
-      return notifications
     },
   },
   Mutation: {
     markAsRead: async (parent, args, context, resolveInfo) => {
       const { user: currentUser } = context
       const session = context.driver.session()
-      let notification
       try {
         const cypher = `
         MATCH (resource {id: $resourceId})-[notification:NOTIFIED {read: FALSE}]->(user:User {id:$id})
@@ -71,11 +69,10 @@ export default {
         `
         const result = await session.run(cypher, { resourceId: args.id, id: currentUser.id })
         const notifications = await result.records.map(transformReturnType)
-        notification = notifications[0]
+        return notifications[0]
       } finally {
         session.close()
       }
-      return notification
     },
   },
   NOTIFIED: {
diff --git a/backend/src/schema/resolvers/passwordReset.js b/backend/src/schema/resolvers/passwordReset.js
index 7c0d9e747..dfbfe8183 100644
--- a/backend/src/schema/resolvers/passwordReset.js
+++ b/backend/src/schema/resolvers/passwordReset.js
@@ -9,7 +9,6 @@ export default {
       return createPasswordReset({ driver, nonce, email })
     },
     resetPassword: async (_parent, { email, nonce, newPassword }, { driver }) => {
-      const session = driver.session()
       const stillValid = new Date()
       stillValid.setDate(stillValid.getDate() - 1)
       const encryptedNewPassword = await bcrypt.hashSync(newPassword, 10)
@@ -21,16 +20,20 @@ export default {
       SET u.encryptedPassword = $encryptedNewPassword
       RETURN pr
       `
-      const transactionRes = await session.run(cypher, {
-        stillValid,
-        email,
-        nonce,
-        encryptedNewPassword,
-      })
-      const [reset] = transactionRes.records.map(record => record.get('pr'))
-      const response = !!(reset && reset.properties.usedAt)
-      session.close()
-      return response
+      const session = driver.session()
+      try {
+        const transactionRes = await session.run(cypher, {
+          stillValid,
+          email,
+          nonce,
+          encryptedNewPassword,
+        })
+        const [reset] = transactionRes.records.map(record => record.get('pr'))
+        const response = !!(reset && reset.properties.usedAt)
+        return response
+      } finally {
+        session.close()
+      }
     },
   },
 }
diff --git a/backend/src/schema/resolvers/passwordReset.spec.js b/backend/src/schema/resolvers/passwordReset.spec.js
index 8b36b8c85..97aa6a020 100644
--- a/backend/src/schema/resolvers/passwordReset.spec.js
+++ b/backend/src/schema/resolvers/passwordReset.spec.js
@@ -15,10 +15,13 @@ let variables
 
 const getAllPasswordResets = async () => {
   const session = driver.session()
-  const transactionRes = await session.run('MATCH (r:PasswordReset) RETURN r')
-  const resets = transactionRes.records.map(record => record.get('r'))
-  session.close()
-  return resets
+  try {
+    const transactionRes = await session.run('MATCH (r:PasswordReset) RETURN r')
+    const resets = transactionRes.records.map(record => record.get('r'))
+    return resets
+  } finally {
+    session.close()
+  }
 }
 
 beforeEach(() => {
diff --git a/backend/src/schema/resolvers/posts.js b/backend/src/schema/resolvers/posts.js
index ee6a82d42..1322b10e4 100644
--- a/backend/src/schema/resolvers/posts.js
+++ b/backend/src/schema/resolvers/posts.js
@@ -54,37 +54,41 @@ export default {
       return neo4jgraphql(object, params, context, resolveInfo)
     },
     PostsEmotionsCountByEmotion: async (object, params, context, resolveInfo) => {
-      const session = context.driver.session()
       const { postId, data } = params
-      const transactionRes = await session.run(
-        `MATCH (post:Post {id: $postId})<-[emoted:EMOTED {emotion: $data.emotion}]-()
+      const session = context.driver.session()
+      try {
+        const transactionRes = await session.run(
+          `MATCH (post:Post {id: $postId})<-[emoted:EMOTED {emotion: $data.emotion}]-()
         RETURN COUNT(DISTINCT emoted) as emotionsCount
         `,
-        { postId, data },
-      )
-      session.close()
+          { postId, data },
+        )
 
-      const [emotionsCount] = transactionRes.records.map(record => {
-        return record.get('emotionsCount').low
-      })
-
-      return emotionsCount
+        const [emotionsCount] = transactionRes.records.map(record => {
+          return record.get('emotionsCount').low
+        })
+        return emotionsCount
+      } finally {
+        session.close()
+      }
     },
     PostsEmotionsByCurrentUser: async (object, params, context, resolveInfo) => {
-      const session = context.driver.session()
       const { postId } = params
-      const transactionRes = await session.run(
-        `MATCH (user:User {id: $userId})-[emoted:EMOTED]->(post:Post {id: $postId})
+      const session = context.driver.session()
+      try {
+        const transactionRes = await session.run(
+          `MATCH (user:User {id: $userId})-[emoted:EMOTED]->(post:Post {id: $postId})
         RETURN collect(emoted.emotion) as emotion`,
-        { userId: context.user.id, postId },
-      )
+          { userId: context.user.id, postId },
+        )
 
-      session.close()
-
-      const [emotions] = transactionRes.records.map(record => {
-        return record.get('emotion')
-      })
-      return emotions
+        const [emotions] = transactionRes.records.map(record => {
+          return record.get('emotion')
+        })
+        return emotions
+      } finally {
+        session.close()
+      }
     },
   },
   Mutation: {
@@ -93,8 +97,6 @@ export default {
       delete params.categoryIds
       params = await fileUpload(params, { file: 'imageUpload', url: 'image' })
       params.id = params.id || uuid()
-      let post
-
       const createPostCypher = `CREATE (post:Post {params})
         SET post.createdAt = toString(datetime())
         SET post.updatedAt = toString(datetime())
@@ -113,7 +115,7 @@ export default {
       try {
         const transactionRes = await session.run(createPostCypher, createPostVariables)
         const posts = transactionRes.records.map(record => record.get('post').properties)
-        post = posts[0]
+        return posts[0]
       } catch (e) {
         if (e.code === 'Neo.ClientError.Schema.ConstraintValidationFailed')
           throw new UserInputError('Post with this slug already exists!')
@@ -121,55 +123,55 @@ export default {
       } finally {
         session.close()
       }
-
-      return post
     },
     UpdatePost: async (_parent, params, context, _resolveInfo) => {
       const { categoryIds } = params
       delete params.categoryIds
       params = await fileUpload(params, { file: 'imageUpload', url: 'image' })
-      const session = context.driver.session()
       let updatePostCypher = `MATCH (post:Post {id: $params.id})
       SET post += $params
       SET post.updatedAt = toString(datetime())
       WITH post
       `
 
-      if (categoryIds && categoryIds.length) {
-        const cypherDeletePreviousRelations = `
+      const session = context.driver.session()
+      try {
+        if (categoryIds && categoryIds.length) {
+          const cypherDeletePreviousRelations = `
           MATCH (post:Post { id: $params.id })-[previousRelations:CATEGORIZED]->(category:Category)
           DELETE previousRelations
           RETURN post, category
         `
 
-        await session.run(cypherDeletePreviousRelations, { params })
+          await session.run(cypherDeletePreviousRelations, { params })
 
-        updatePostCypher += `
+          updatePostCypher += `
           UNWIND $categoryIds AS categoryId
           MATCH (category:Category {id: categoryId})
           MERGE (post)-[:CATEGORIZED]->(category)
           WITH post
         `
+        }
+
+        updatePostCypher += `RETURN post`
+        const updatePostVariables = { categoryIds, params }
+
+        const transactionRes = await session.run(updatePostCypher, updatePostVariables)
+        const [post] = transactionRes.records.map(record => {
+          return record.get('post').properties
+        })
+        return post
+      } finally {
+        session.close()
       }
-
-      updatePostCypher += `RETURN post`
-      const updatePostVariables = { categoryIds, params }
-
-      const transactionRes = await session.run(updatePostCypher, updatePostVariables)
-      const [post] = transactionRes.records.map(record => {
-        return record.get('post').properties
-      })
-
-      session.close()
-
-      return post
     },
 
     DeletePost: async (object, args, context, resolveInfo) => {
       const session = context.driver.session()
-      // we cannot set slug to 'UNAVAILABE' because of unique constraints
-      const transactionRes = await session.run(
-        `
+      try {
+        // we cannot set slug to 'UNAVAILABE' because of unique constraints
+        const transactionRes = await session.run(
+          `
         MATCH (post:Post {id: $postId})
         OPTIONAL MATCH (post)<-[:COMMENTS]-(comment:Comment)
         SET post.deleted        = TRUE
@@ -180,51 +182,60 @@ export default {
         REMOVE post.image
         RETURN post
       `,
-        { postId: args.id },
-      )
-      session.close()
-      const [post] = transactionRes.records.map(record => record.get('post').properties)
-      return post
+          { postId: args.id },
+        )
+        const [post] = transactionRes.records.map(record => record.get('post').properties)
+        return post
+      } finally {
+        session.close()
+      }
     },
     AddPostEmotions: async (object, params, context, resolveInfo) => {
-      const session = context.driver.session()
       const { to, data } = params
       const { user } = context
-      const transactionRes = await session.run(
-        `MATCH (userFrom:User {id: $user.id}), (postTo:Post {id: $to.id})
+      const session = context.driver.session()
+      try {
+        const transactionRes = await session.run(
+          `MATCH (userFrom:User {id: $user.id}), (postTo:Post {id: $to.id})
         MERGE (userFrom)-[emotedRelation:EMOTED {emotion: $data.emotion}]->(postTo)
         RETURN userFrom, postTo, emotedRelation`,
-        { user, to, data },
-      )
-      session.close()
-      const [emoted] = transactionRes.records.map(record => {
-        return {
-          from: { ...record.get('userFrom').properties },
-          to: { ...record.get('postTo').properties },
-          ...record.get('emotedRelation').properties,
-        }
-      })
-      return emoted
+          { user, to, data },
+        )
+
+        const [emoted] = transactionRes.records.map(record => {
+          return {
+            from: { ...record.get('userFrom').properties },
+            to: { ...record.get('postTo').properties },
+            ...record.get('emotedRelation').properties,
+          }
+        })
+        return emoted
+      } finally {
+        session.close()
+      }
     },
     RemovePostEmotions: async (object, params, context, resolveInfo) => {
-      const session = context.driver.session()
       const { to, data } = params
       const { id: from } = context.user
-      const transactionRes = await session.run(
-        `MATCH (userFrom:User {id: $from})-[emotedRelation:EMOTED {emotion: $data.emotion}]->(postTo:Post {id: $to.id})
+      const session = context.driver.session()
+      try {
+        const transactionRes = await session.run(
+          `MATCH (userFrom:User {id: $from})-[emotedRelation:EMOTED {emotion: $data.emotion}]->(postTo:Post {id: $to.id})
         DELETE emotedRelation
         RETURN userFrom, postTo`,
-        { from, to, data },
-      )
-      session.close()
-      const [emoted] = transactionRes.records.map(record => {
-        return {
-          from: { ...record.get('userFrom').properties },
-          to: { ...record.get('postTo').properties },
-          emotion: data.emotion,
-        }
-      })
-      return emoted
+          { from, to, data },
+        )
+        const [emoted] = transactionRes.records.map(record => {
+          return {
+            from: { ...record.get('userFrom').properties },
+            to: { ...record.get('postTo').properties },
+            emotion: data.emotion,
+          }
+        })
+        return emoted
+      } finally {
+        session.close()
+      }
     },
     pinPost: async (_parent, params, context, _resolveInfo) => {
       let pinnedPostWithNestedAttributes
@@ -242,25 +253,25 @@ export default {
         )
         return deletePreviousRelationsResponse.records.map(record => record.get('post').properties)
       })
-      await writeTxResultPromise
+      try {
+        await writeTxResultPromise
 
-      writeTxResultPromise = session.writeTransaction(async transaction => {
-        const pinPostTransactionResponse = await transaction.run(
-          `
+        writeTxResultPromise = session.writeTransaction(async transaction => {
+          const pinPostTransactionResponse = await transaction.run(
+            `
             MATCH (user:User {id: $userId}) WHERE user.role = 'admin'
             MATCH (post:Post {id: $params.id})
             MERGE (user)-[pinned:PINNED {createdAt: toString(datetime())}]->(post)
             SET post.pinned = true
             RETURN post, pinned.createdAt as pinnedAt
          `,
-          { userId, params },
-        )
-        return pinPostTransactionResponse.records.map(record => ({
-          pinnedPost: record.get('post').properties,
-          pinnedAt: record.get('pinnedAt'),
-        }))
-      })
-      try {
+            { userId, params },
+          )
+          return pinPostTransactionResponse.records.map(record => ({
+            pinnedPost: record.get('post').properties,
+            pinnedAt: record.get('pinnedAt'),
+          }))
+        })
         const [transactionResult] = await writeTxResultPromise
         const { pinnedPost, pinnedAt } = transactionResult
         pinnedPostWithNestedAttributes = {
diff --git a/backend/src/schema/resolvers/reports.js b/backend/src/schema/resolvers/reports.js
index 083c94362..8e12f1dba 100644
--- a/backend/src/schema/resolvers/reports.js
+++ b/backend/src/schema/resolvers/reports.js
@@ -5,31 +5,31 @@ export default {
       const { resourceId, reasonCategory, reasonDescription } = params
       const { driver, user } = context
       const session = driver.session()
-      const writeTxResultPromise = session.writeTransaction(async txc => {
-        const reportRelationshipTransactionResponse = await txc.run(
-          `
+      try {
+        const writeTxResultPromise = session.writeTransaction(async txc => {
+          const reportRelationshipTransactionResponse = await txc.run(
+            `
             MATCH (submitter:User {id: $submitterId})
             MATCH (resource {id: $resourceId})
             WHERE resource:User OR resource:Comment OR resource:Post
             CREATE (resource)<-[report:REPORTED {createdAt: $createdAt, reasonCategory: $reasonCategory, reasonDescription: $reasonDescription}]-(submitter)
             RETURN report, submitter, resource, labels(resource)[0] as type
           `,
-          {
-            resourceId,
-            submitterId: user.id,
-            createdAt: new Date().toISOString(),
-            reasonCategory,
-            reasonDescription,
-          },
-        )
-        return reportRelationshipTransactionResponse.records.map(record => ({
-          report: record.get('report'),
-          submitter: record.get('submitter'),
-          resource: record.get('resource').properties,
-          type: record.get('type'),
-        }))
-      })
-      try {
+            {
+              resourceId,
+              submitterId: user.id,
+              createdAt: new Date().toISOString(),
+              reasonCategory,
+              reasonDescription,
+            },
+          )
+          return reportRelationshipTransactionResponse.records.map(record => ({
+            report: record.get('report'),
+            submitter: record.get('submitter'),
+            resource: record.get('resource').properties,
+            type: record.get('type'),
+          }))
+        })
         const txResult = await writeTxResultPromise
         if (!txResult[0]) return null
         const { report, submitter, resource, type } = txResult[0]
@@ -61,7 +61,6 @@ export default {
   Query: {
     reports: async (_parent, params, context, _resolveInfo) => {
       const { driver } = context
-      const session = driver.session()
       let response
       let orderByClause
       switch (params.orderBy) {
@@ -74,6 +73,7 @@ export default {
         default:
           orderByClause = ''
       }
+      const session = driver.session()
       try {
         const cypher = `
           MATCH (submitter:User)-[report:REPORTED]->(resource)
diff --git a/backend/src/schema/resolvers/shout.js b/backend/src/schema/resolvers/shout.js
index 05de9b103..ada1172a4 100644
--- a/backend/src/schema/resolvers/shout.js
+++ b/backend/src/schema/resolvers/shout.js
@@ -4,48 +4,51 @@ export default {
       const { id, type } = params
 
       const session = context.driver.session()
-      const transactionRes = await session.run(
-        `MATCH (node {id: $id})<-[:WROTE]-(userWritten:User), (user:User {id: $userId})
+      try {
+        const transactionRes = await session.run(
+          `MATCH (node {id: $id})<-[:WROTE]-(userWritten:User), (user:User {id: $userId})
           WHERE $type IN labels(node) AND NOT userWritten.id = $userId
           MERGE (user)-[relation:SHOUTED{createdAt:toString(datetime())}]->(node)
           RETURN COUNT(relation) > 0 as isShouted`,
-        {
-          id,
-          type,
-          userId: context.user.id,
-        },
-      )
+          {
+            id,
+            type,
+            userId: context.user.id,
+          },
+        )
 
-      const [isShouted] = transactionRes.records.map(record => {
-        return record.get('isShouted')
-      })
+        const [isShouted] = transactionRes.records.map(record => {
+          return record.get('isShouted')
+        })
 
-      session.close()
-
-      return isShouted
+        return isShouted
+      } finally {
+        session.close()
+      }
     },
 
     unshout: async (_object, params, context, _resolveInfo) => {
       const { id, type } = params
       const session = context.driver.session()
-
-      const transactionRes = await session.run(
-        `MATCH (user:User {id: $userId})-[relation:SHOUTED]->(node {id: $id})
+      try {
+        const transactionRes = await session.run(
+          `MATCH (user:User {id: $userId})-[relation:SHOUTED]->(node {id: $id})
           WHERE $type IN labels(node)
           DELETE relation
           RETURN COUNT(relation) > 0 as isShouted`,
-        {
-          id,
-          type,
-          userId: context.user.id,
-        },
-      )
-      const [isShouted] = transactionRes.records.map(record => {
-        return record.get('isShouted')
-      })
-      session.close()
-
-      return isShouted
+          {
+            id,
+            type,
+            userId: context.user.id,
+          },
+        )
+        const [isShouted] = transactionRes.records.map(record => {
+          return record.get('isShouted')
+        })
+        return isShouted
+      } finally {
+        session.close()
+      }
     },
   },
 }
diff --git a/backend/src/schema/resolvers/statistics.js b/backend/src/schema/resolvers/statistics.js
index 7b06f8705..e8745efea 100644
--- a/backend/src/schema/resolvers/statistics.js
+++ b/backend/src/schema/resolvers/statistics.js
@@ -33,10 +33,10 @@ export default {
          * Note: invites count is calculated this way because invitation codes are not in use yet
          */
         response.countInvites = response.countEmails - response.countUsers
+        return response
       } finally {
         session.close()
       }
-      return response
     },
   },
 }
diff --git a/backend/src/schema/resolvers/user_management.js b/backend/src/schema/resolvers/user_management.js
index 81550d8cf..4c4c3fc90 100644
--- a/backend/src/schema/resolvers/user_management.js
+++ b/backend/src/schema/resolvers/user_management.js
@@ -24,29 +24,32 @@ export default {
       // }
       email = normalizeEmail(email)
       const session = driver.session()
-      const result = await session.run(
-        `
+      try {
+        const result = await session.run(
+          `
         MATCH (user:User {deleted: false})-[:PRIMARY_EMAIL]->(e:EmailAddress {email: $userEmail})
         RETURN user {.id, .slug, .name, .avatar, .encryptedPassword, .role, .disabled, email:e.email} as user LIMIT 1
       `,
-        { userEmail: email },
-      )
-      session.close()
-      const [currentUser] = await result.records.map(record => {
-        return record.get('user')
-      })
+          { userEmail: email },
+        )
+        const [currentUser] = await result.records.map(record => {
+          return record.get('user')
+        })
 
-      if (
-        currentUser &&
-        (await bcrypt.compareSync(password, currentUser.encryptedPassword)) &&
-        !currentUser.disabled
-      ) {
-        delete currentUser.encryptedPassword
-        return encode(currentUser)
-      } else if (currentUser && currentUser.disabled) {
-        throw new AuthenticationError('Your account has been disabled.')
-      } else {
-        throw new AuthenticationError('Incorrect email address or password.')
+        if (
+          currentUser &&
+          (await bcrypt.compareSync(password, currentUser.encryptedPassword)) &&
+          !currentUser.disabled
+        ) {
+          delete currentUser.encryptedPassword
+          return encode(currentUser)
+        } else if (currentUser && currentUser.disabled) {
+          throw new AuthenticationError('Your account has been disabled.')
+        } else {
+          throw new AuthenticationError('Incorrect email address or password.')
+        }
+      } finally {
+        session.close()
       }
     },
     changePassword: async (_, { oldPassword, newPassword }, { driver, user }) => {
diff --git a/backend/src/seed/factories/index.js b/backend/src/seed/factories/index.js
index 5054155fc..1b090530b 100644
--- a/backend/src/seed/factories/index.js
+++ b/backend/src/seed/factories/index.js
@@ -27,8 +27,8 @@ const factories = {
 
 export const cleanDatabase = async (options = {}) => {
   const { driver = getDriver() } = options
-  const session = driver.session()
   const cypher = 'MATCH (n) DETACH DELETE n'
+  const session = driver.session()
   try {
     return await session.run(cypher)
   } finally {

From 46b6483c9085c1b968448fcccc3af14e9cc57a0a Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Mon, 2 Dec 2019 20:48:12 +0100
Subject: [PATCH 141/174] Add story/spec for CounterIcon component

---
 .../generic/CounterIcon/CounterIcon.spec.js   | 37 +++++++++++++++++++
 .../generic/CounterIcon/CounterIcon.story.js  | 19 ++++++++++
 2 files changed, 56 insertions(+)
 create mode 100644 webapp/components/_new/generic/CounterIcon/CounterIcon.spec.js
 create mode 100644 webapp/components/_new/generic/CounterIcon/CounterIcon.story.js

diff --git a/webapp/components/_new/generic/CounterIcon/CounterIcon.spec.js b/webapp/components/_new/generic/CounterIcon/CounterIcon.spec.js
new file mode 100644
index 000000000..01d753c9d
--- /dev/null
+++ b/webapp/components/_new/generic/CounterIcon/CounterIcon.spec.js
@@ -0,0 +1,37 @@
+import { mount } from '@vue/test-utils'
+import CounterIcon from './CounterIcon'
+import BaseIcon from '../BaseIcon/BaseIcon'
+
+const localVue = global.localVue
+
+describe('CounterIcon.vue', () => {
+  let propsData, wrapper, tag
+
+  const Wrapper = () => {
+    return mount(CounterIcon, { propsData, localVue })
+  }
+
+  describe('given a valid icon name and count', () => {
+    beforeEach(() => {
+      propsData = { icon: 'comments', count: 1 }
+      wrapper = Wrapper()
+      tag = wrapper.find('.ds-tag')
+    })
+
+    it('renders BaseIcon', () => {
+      expect(wrapper.find(BaseIcon).exists()).toBe(true)
+    })
+
+    it('renders the count', () => {
+      expect(tag.text()).toEqual('1')
+    })
+
+    it('uses a round tag', () => {
+      expect(tag.classes()).toContain('ds-tag-round')
+    })
+
+    it('uses a primary button', () => {
+      expect(tag.classes()).toContain('ds-tag-primary')
+    })
+  })
+})
diff --git a/webapp/components/_new/generic/CounterIcon/CounterIcon.story.js b/webapp/components/_new/generic/CounterIcon/CounterIcon.story.js
new file mode 100644
index 000000000..df8291957
--- /dev/null
+++ b/webapp/components/_new/generic/CounterIcon/CounterIcon.story.js
@@ -0,0 +1,19 @@
+import { storiesOf } from '@storybook/vue'
+import helpers from '~/storybook/helpers'
+import CounterIcon from './CounterIcon.vue'
+
+storiesOf('CounterIcon', module)
+  .addDecorator(helpers.layout)
+  .add('flag icon with button in slot position', () => ({
+    components: { CounterIcon },
+    data() {
+      return { icon: 'flag', count: 3 }
+    },
+    template: `
+      <counter-icon icon="pizza" :count="count">
+        <ds-button ghost primary>
+          Report Details
+        </ds-button>
+      </counter-icon>
+    `,
+  }))

From e1c56346cc1636f297aceae9c6e87dd562a6b7d4 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Mon, 2 Dec 2019 20:48:48 +0100
Subject: [PATCH 142/174] Add story/spec for ReportsTable component/refactor

- use data-test to target elements in tests
---
 .../ReportsTable/ReportsTable.spec.js         | 198 +++++++++++++++++-
 .../ReportsTable/ReportsTable.story.js        | 169 +++++++++++++++
 .../features/ReportsTable/ReportsTable.vue    |  36 ++--
 3 files changed, 382 insertions(+), 21 deletions(-)
 create mode 100644 webapp/components/_new/features/ReportsTable/ReportsTable.story.js

diff --git a/webapp/components/_new/features/ReportsTable/ReportsTable.spec.js b/webapp/components/_new/features/ReportsTable/ReportsTable.spec.js
index e8e7245a6..93be3ee6d 100644
--- a/webapp/components/_new/features/ReportsTable/ReportsTable.spec.js
+++ b/webapp/components/_new/features/ReportsTable/ReportsTable.spec.js
@@ -1,36 +1,216 @@
-import { config, mount } from '@vue/test-utils'
+import { config, mount, RouterLinkStub } from '@vue/test-utils'
+import Vuex from 'vuex'
 import ReportsTable from './ReportsTable.vue'
-import Styleguide from '@human-connection/styleguide'
+import { reports } from './ReportsTable.story.js'
+import BaseIcon from '~/components/_new/generic/BaseIcon/BaseIcon'
 
 const localVue = global.localVue
-localVue.use(Styleguide)
 
 config.stubs['client-only'] = '<span><slot /></span>'
 
 describe('ReportsTable', () => {
-  let propsData
-  let mocks
+  let propsData, mocks, stubs, getters, wrapper, reportsTable
+
   beforeEach(() => {
     propsData = {}
     mocks = {
-      $t: jest.fn(t => t),
+      $t: jest.fn(string => string),
+    }
+    stubs = {
+      NuxtLink: RouterLinkStub,
+    }
+    getters = {
+      'auth/user': () => {
+        return { slug: 'awesome-user' }
+      },
+      'auth/isModerator': () => true,
     }
   })
 
   describe('mount', () => {
     const Wrapper = () => {
-      return mount(ReportsTable, { propsData, mocks, localVue })
+      const store = new Vuex.Store({
+        getters,
+      })
+      return mount(ReportsTable, { propsData, mocks, stubs, localVue, store })
     }
 
-    describe('no reports', () => {
+    describe('given no reports', () => {
       beforeEach(() => {
         propsData = { ...propsData, reports: [] }
+        wrapper = Wrapper()
       })
 
       it('shows a placeholder', () => {
-        const wrapper = Wrapper()
         expect(wrapper.text()).toContain('moderation.reports.empty')
       })
     })
+
+    describe('given reports', () => {
+      beforeEach(() => {
+        propsData = { ...propsData, reports }
+        wrapper = Wrapper()
+        reportsTable = wrapper.find('.ds-table')
+      })
+
+      it('renders a table', () => {
+        expect(reportsTable.exists()).toBe(true)
+      })
+
+      describe('Comment', () => {
+        let commentRow
+        beforeEach(() => {
+          commentRow = wrapper.find('[data-test="Comment"]')
+        })
+
+        it('renders a comments icon', () => {
+          const commentsIcon = commentRow.find(BaseIcon).props().name
+          expect(commentsIcon).toEqual('comments')
+        })
+
+        it('renders a link to the post, with the comment contentExcerpt', () => {
+          const postLink = commentRow.find('[data-test="post-link"]')
+          expect(postLink.text()).toEqual('@peter-lustig Lorem ipsum dolor sit amet, …')
+        })
+
+        it('renders the author', () => {
+          const username = commentRow.find('[data-test="louie"] b')
+          expect(username.text()).toEqual('Louie')
+        })
+
+        describe('given it has been reviewed', () => {
+          it('renders the enabled icon', () => {
+            const enabledIcon = commentRow
+              .findAll(BaseIcon)
+              .filter(icon => icon.props().name === 'eye')
+            expect(enabledIcon.exists()).toBe(true)
+          })
+
+          it('renders its current status', () => {
+            expect(commentRow.find('[data-test="enabled"]').text()).toEqual(
+              'moderation.reports.enabledBy',
+            )
+          })
+
+          it('renders the moderator who reviewed the resource', () => {
+            const username = commentRow.find('[data-test="moderator"] b')
+            expect(username.text()).toEqual('Moderator')
+          })
+        })
+
+        describe('give report has not been closed', () => {
+          let confirmButton
+          beforeEach(() => {
+            confirmButton = commentRow.find('button.confirm')
+          })
+          it('renders a confirm button', () => {
+            expect(confirmButton.exists()).toBe(true)
+          })
+
+          it('emits confirm event', () => {
+            confirmButton.trigger('click')
+            expect(wrapper.emitted().confirm[0][0]).toEqual(reports[0])
+          })
+        })
+      })
+
+      describe('Post', () => {
+        let postRow
+        beforeEach(() => {
+          postRow = wrapper.find('[data-test="Post"]')
+        })
+
+        it('renders a bookmark icon', () => {
+          const postIcon = postRow.find(BaseIcon).props().name
+          expect(postIcon).toEqual('bookmark')
+        })
+
+        it('renders a link to the post', () => {
+          const postLink = postRow.find('[data-test="post-link"]')
+          expect(postLink.text()).toEqual("I'm a bigoted post!")
+        })
+
+        it('renders the author', () => {
+          const username = postRow.find('[data-test="dagobert"] b')
+          expect(username.text()).toEqual('Dagobert')
+        })
+
+        describe('given it has not been reviewed', () => {
+          it('renders the enabled icon', () => {
+            const enabledIcon = postRow
+              .findAll(BaseIcon)
+              .filter(icon => icon.props().name === 'eye')
+            expect(enabledIcon.exists()).toBe(true)
+          })
+
+          it('renders its current status', () => {
+            expect(postRow.find('[data-test="unreviewed"]').text()).toEqual(
+              'moderation.reports.enabled',
+            )
+          })
+        })
+
+        describe('give report has not been closed', () => {
+          let confirmButton
+          beforeEach(() => {
+            confirmButton = postRow.find('button.confirm')
+          })
+
+          it('renders a confirm button', () => {
+            expect(confirmButton.exists()).toBe(true)
+          })
+
+          it('emits confirm event', () => {
+            confirmButton.trigger('click')
+            expect(wrapper.emitted().confirm[0][0]).toEqual(reports[1])
+          })
+        })
+      })
+
+      describe('User', () => {
+        let userRow
+        beforeEach(() => {
+          userRow = wrapper.find('[data-test="User"]')
+        })
+
+        it('renders a bookmark icon', () => {
+          const userIcon = userRow.find(BaseIcon).props().name
+          expect(userIcon).toEqual('user')
+        })
+
+        it('renders a link to the user profile', () => {
+          const userLink = userRow.find('[data-test="abusive-user"] b')
+          expect(userLink.text()).toEqual('Abusive user')
+        })
+
+        describe('given it has been reviewed', () => {
+          it('renders the disabled icon', () => {
+            const disabledIcon = userRow
+              .findAll(BaseIcon)
+              .filter(icon => icon.props().name === 'eye-slash')
+            expect(disabledIcon.exists()).toBe(true)
+          })
+
+          it('renders its current status', () => {
+            expect(userRow.find('[data-test="disabled"]').text()).toEqual(
+              'moderation.reports.disabledBy',
+            )
+          })
+
+          it('renders the moderator who reviewed the resource', () => {
+            const username = userRow.find('[data-test="peter-lustig"] b')
+            expect(username.text()).toEqual('Peter Lustig')
+          })
+        })
+
+        describe('give report has been closed', () => {
+          it('renders Decided text', () => {
+            expect(userRow.find('[data-test="closed"]').text()).toEqual(
+              'moderation.reports.decided',
+            )
+          })
+        })
+      })
+    })
   })
 })
diff --git a/webapp/components/_new/features/ReportsTable/ReportsTable.story.js b/webapp/components/_new/features/ReportsTable/ReportsTable.story.js
new file mode 100644
index 000000000..425906564
--- /dev/null
+++ b/webapp/components/_new/features/ReportsTable/ReportsTable.story.js
@@ -0,0 +1,169 @@
+import { storiesOf } from '@storybook/vue'
+import { withA11y } from '@storybook/addon-a11y'
+import { action } from '@storybook/addon-actions'
+import ReportsTable from '~/components/_new/features/ReportsTable/ReportsTable'
+import helpers from '~/storybook/helpers'
+import { post } from '~/components/PostCard/PostCard.story.js'
+import { user } from '~/components/User/User.story.js'
+
+helpers.init()
+export const reports = [
+  {
+    __typename: 'Report',
+    closed: false,
+    createdAt: '2019-10-29T15:36:02.106Z',
+    updatedAt: '2019-12-02T15:56:35.651Z',
+    disable: false,
+    filed: [
+      {
+        __typename: 'FILED',
+        createdAt: '2019-12-02T15:56:35.676Z',
+        reasonCategory: 'pornographic_content_links',
+        reasonDescription: 'This comment is porno!!!',
+        submitter: {
+          ...user,
+        },
+      },
+    ],
+    resource: {
+      __typename: 'Comment',
+      id: 'b6b38937-3efc-4d5e-b12c-549e4d6551a5',
+      createdAt: '2019-10-29T15:38:25.184Z',
+      updatedAt: '2019-10-30T15:38:25.184Z',
+      disabled: false,
+      deleted: false,
+      content:
+        '<p><a class="mention" href="/profile/u1" data-mention-id="u1" target="_blank">@peter-lustig</a> </p><p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Turpis egestas pretium aenean pharetra magna ac placerat. Tempor id eu nisl nunc mi ipsum faucibus vitae. Nibh praesent tristique magna sit amet purus gravida quis blandit. Magna eget est lorem ipsum dolor. In fermentum posuere urna nec. Eleifend donec pretium vulputate sapien nec sagittis aliquam. Augue interdum velit euismod in pellentesque. Id diam maecenas ultricies mi eget mauris pharetra. Donec pretium vulputate sapien nec. Dolor morbi non arcu risus quis varius quam quisque. Blandit turpis cursus in hac habitasse. Est ultricies integer quis auctor elit sed vulputate mi sit. Nunc consequat interdum varius sit amet mattis vulputate enim. Semper feugiat nibh sed pulvinar. Eget felis eget nunc lobortis mattis aliquam. Ultrices vitae auctor eu augue. Tellus molestie nunc non blandit massa enim nec dui. Pharetra massa massa ultricies mi quis hendrerit dolor. Nisl suscipit adipiscing bibendum est ultricies integer.</p>',
+      contentExcerpt:
+        '<p><a href="/profile/u1" target="_blank">@peter-lustig</a> </p><p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Turpis egestas pretium aenean pharetra …</p>',
+      post,
+      author: user,
+    },
+    reviewed: [
+      {
+        updatedAt: '2019-10-30T15:38:25.184Z',
+        moderator: {
+          __typename: 'User',
+          ...user,
+          name: 'Moderator',
+          id: 'moderator',
+          slug: 'moderator',
+        },
+      },
+      {
+        updatedAt: '2019-10-29T15:38:25.184Z',
+        moderator: {
+          __typename: 'User',
+          ...user,
+          name: 'Peter Lustig',
+          id: 'u3',
+          slug: 'peter-lustig',
+        },
+      },
+    ],
+  },
+  {
+    __typename: 'Report',
+    closed: false,
+    createdAt: '2019-10-31T15:36:02.106Z',
+    updatedAt: '2019-12-03T15:56:35.651Z',
+    disable: true,
+    filed: [
+      {
+        __typename: 'FILED',
+        createdAt: '2019-10-31T15:36:02.106Z',
+        reasonCategory: 'discrimination_etc',
+        reasonDescription: 'This post is bigoted',
+        submitter: {
+          ...user,
+        },
+      },
+    ],
+    resource: {
+      __typename: 'Post',
+      author: {
+        ...user,
+        id: 'u7',
+        name: 'Dagobert',
+        slug: 'dagobert',
+      },
+      deleted: false,
+      disabled: true,
+      id: 'p2',
+      slug: 'bigoted-post',
+      title: "I'm a bigoted post!",
+    },
+    reviewed: null,
+  },
+  {
+    __typename: 'Report',
+    closed: true,
+    createdAt: '2019-10-30T15:36:02.106Z',
+    updatedAt: '2019-12-01T15:56:35.651Z',
+    disable: true,
+    filed: [
+      {
+        __typename: 'FILED',
+        createdAt: '2019-10-30T15:36:02.106Z',
+        reasonCategory: 'discrimination_etc',
+        reasonDescription: 'this user is attacking me for who I am!',
+        submitter: {
+          ...user,
+        },
+      },
+    ],
+    resource: {
+      __typename: 'User',
+      commentedCount: 0,
+      contributionsCount: 0,
+      deleted: false,
+      disabled: true,
+      followedByCount: 0,
+      id: 'u5',
+      name: 'Abusive user',
+      slug: 'abusive-user',
+    },
+    reviewed: [
+      {
+        updatedAt: '2019-12-01T15:56:35.651Z',
+        moderator: {
+          __typename: 'User',
+          ...user,
+          name: 'Peter Lustig',
+          id: 'u3',
+          slug: 'peter-lustig',
+        },
+      },
+      {
+        updatedAt: '2019-11-30T15:56:35.651Z',
+        moderator: {
+          __typename: 'User',
+          ...user,
+          name: 'Moderator',
+          id: 'moderator',
+          slug: 'moderator',
+        },
+      },
+    ],
+  },
+]
+
+storiesOf('ReportsTable', module)
+  .addDecorator(withA11y)
+  .addDecorator(helpers.layout)
+  .add('with reports', () => ({
+    components: { ReportsTable },
+    store: helpers.store,
+    data: () => ({
+      reports,
+    }),
+    methods: {
+      confirm: action('confirm'),
+    },
+    template: `<reports-table :reports="reports" @confirm="confirm" />`,
+  }))
+  .add('without reports', () => ({
+    components: { ReportsTable },
+    store: helpers.store,
+    template: `<reports-table />`,
+  }))
diff --git a/webapp/components/_new/features/ReportsTable/ReportsTable.vue b/webapp/components/_new/features/ReportsTable/ReportsTable.vue
index a8fa669db..29637aefb 100644
--- a/webapp/components/_new/features/ReportsTable/ReportsTable.vue
+++ b/webapp/components/_new/features/ReportsTable/ReportsTable.vue
@@ -34,7 +34,7 @@
         </tr>
       </thead>
       <tbody :key="'tbody-' + report.resource.id">
-        <tr valign="top">
+        <tr valign="top" :data-test="report.resource.__typename">
           <td class="ds-table-col">
             <ds-text color="soft">
               <base-icon
@@ -57,18 +57,29 @@
           <td class="ds-table-col ">
             <div v-if="isPost(report.resource) || isComment(report.resource)">
               <nuxt-link
+                data-test="post-link"
                 :to="{
                   name: 'post-id-slug',
                   params: params(report.resource),
                   hash: hashParam(report.resource),
                 }"
               >
-                <b>{{ report.resource.title || report.resource.contentExcerpt | truncate(50) }}</b>
+                <b>
+                  {{
+                    report.resource.title ||
+                      $filters.removeHtml(report.resource.contentExcerpt) | truncate(50)
+                  }}
+                </b>
               </nuxt-link>
             </div>
             <div v-else>
               <client-only>
-                <hc-user :user="report.resource" :showAvatar="false" :trunc="30" />
+                <hc-user
+                  :user="report.resource"
+                  :showAvatar="false"
+                  :trunc="30"
+                  :data-test="report.resource.slug"
+                />
               </client-only>
             </div>
           </td>
@@ -79,6 +90,7 @@
                 :user="report.resource.author"
                 :showAvatar="false"
                 :trunc="30"
+                :data-test="report.resource.author.slug"
               />
               <span v-else>—</span>
             </client-only>
@@ -86,38 +98,35 @@
           <td>
             <div v-if="report.reviewed">
               <br />
-              <div v-if="report.resource.disabled">
+              <div v-if="report.resource.disabled" data-test="disabled">
                 <base-icon name="eye-slash" class="ban" />
                 {{ $t('moderation.reports.disabledBy') }}
               </div>
-              <div v-else>
+              <div v-else data-test="enabled">
                 <base-icon name="eye" class="no-ban" />
                 {{ $t('moderation.reports.enabledBy') }}
               </div>
               <client-only>
                 <hc-user
-                  :user="report.reviewed[0].moderator"
+                  :user="moderatorOfLatestReview(report)"
                   :showAvatar="false"
                   :trunc="30"
                   :date-time="report.updatedAt"
                   positionDatetime="below"
+                  :data-test="moderatorOfLatestReview(report).slug"
                 />
               </client-only>
             </div>
             <div v-else>
               <br />
-              <div v-if="report.resource.disabled">
-                <base-icon name="eye-slash" class="ban" />
-                {{ $t('moderation.reports.disabled') }}
-              </div>
-              <div v-else>
+              <div data-test="unreviewed">
                 <base-icon name="eye" class="no-ban" />
                 {{ $t('moderation.reports.enabled') }}
               </div>
             </div>
           </td>
           <td class="ds-table-col">
-            <b v-if="report.closed">
+            <b v-if="report.closed" data-test="closed">
               {{ $t('moderation.reports.decided') }}
             </b>
             <ds-button
@@ -187,6 +196,9 @@ export default {
     isUser(resource) {
       return resource.__typename === 'User'
     },
+    moderatorOfLatestReview(report) {
+      return report.reviewed[0].moderator
+    },
     params(resource) {
       const post = this.isComment(resource) ? resource.post : resource
       return {

From 7db3696819704edc53241b973c9d9948593fc32c Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Mon, 2 Dec 2019 20:50:28 +0100
Subject: [PATCH 143/174] Return createdAt/updatedAt for Report

---
 webapp/graphql/Moderation.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/webapp/graphql/Moderation.js b/webapp/graphql/Moderation.js
index da2054d66..df9d17870 100644
--- a/webapp/graphql/Moderation.js
+++ b/webapp/graphql/Moderation.js
@@ -11,6 +11,8 @@ export const reportsListQuery = () => {
         disable
         closed
         reviewed {
+          createdAt
+          updatedAt
           disable
           moderator {
             id

From bcbce2a34a5f73d7b157a63dd93b686e51fbf61f Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Mon, 2 Dec 2019 20:50:55 +0100
Subject: [PATCH 144/174] Refactor modalData to use mapMutations, computed

- clean it up some
---
 .../_new/features/ReportList/ReportList.vue   | 93 ++++++++++---------
 1 file changed, 49 insertions(+), 44 deletions(-)

diff --git a/webapp/components/_new/features/ReportList/ReportList.vue b/webapp/components/_new/features/ReportList/ReportList.vue
index 2a141a875..c4269ac13 100644
--- a/webapp/components/_new/features/ReportList/ReportList.vue
+++ b/webapp/components/_new/features/ReportList/ReportList.vue
@@ -15,6 +15,7 @@
   </ds-card>
 </template>
 <script>
+import { mapMutations } from 'vuex'
 import DropdownFilter from '~/components/DropdownFilter/DropdownFilter'
 import ReportsTable from '~/components/_new/features/ReportsTable/ReportsTable'
 import { reportsListQuery, reviewMutation } from '~/graphql/Moderation.js'
@@ -46,8 +47,55 @@ export default {
         { label: this.$t('moderation.reports.filterLabel.closed'), value: this.closedReports },
       ]
     },
+    modalData() {
+      return function(report) {
+        const identStart =
+          'moderation.reports.decideModal.' +
+          report.resource.__typename +
+          '.' +
+          (report.resource.disabled ? 'disable' : 'enable')
+        return {
+          name: 'confirm',
+          data: {
+            type: report.resource.__typename,
+            resource: report.resource,
+            modalData: {
+              titleIdent: identStart + '.title',
+              messageIdent: identStart + '.message',
+              messageParams: {
+                name:
+                  report.resource.name ||
+                  this.$filters.truncate(report.resource.title, 30) ||
+                  this.$filters.truncate(
+                    this.$filters.removeHtml(report.resource.contentExcerpt),
+                    30,
+                  ),
+              },
+              buttons: {
+                confirm: {
+                  danger: true,
+                  icon: report.resource.disabled ? 'eye-slash' : 'eye',
+                  textIdent: 'moderation.reports.decideModal.submit',
+                  callback: () => {
+                    this.confirmCallback(report.resource)
+                  },
+                },
+                cancel: {
+                  icon: 'close',
+                  textIdent: 'moderation.reports.decideModal.cancel',
+                  callback: () => {},
+                },
+              },
+            },
+          },
+        }
+      }
+    },
   },
   methods: {
+    ...mapMutations({
+      commitModalData: 'modal/SET_OPEN',
+    }),
     filter(option) {
       this.reports = option.value
       this.selected = option.label
@@ -69,50 +117,7 @@ export default {
         .catch(error => this.$toast.error(error.message))
     },
     openModal(report) {
-      const identStart =
-        'moderation.reports.decideModal.' +
-        report.resource.__typename +
-        '.' +
-        (report.resource.disabled ? 'disable' : 'enable')
-      this.$store.commit('modal/SET_OPEN', {
-        name: 'confirm',
-        data: {
-          type: report.resource.__typename,
-          resource: report.resource,
-          modalData: {
-            titleIdent: identStart + '.title',
-            messageIdent: identStart + '.message',
-            messageParams: {
-              name:
-                report.resource.__typename === 'User'
-                  ? report.resource.name
-                  : report.resource.__typename === 'Post'
-                  ? this.$filters.truncate(report.resource.title, 30)
-                  : report.resource.__typename === 'Comment'
-                  ? this.$filters.truncate(
-                      this.$filters.removeHtml(report.resource.contentExcerpt),
-                      30,
-                    )
-                  : '',
-            },
-            buttons: {
-              confirm: {
-                danger: true,
-                icon: report.resource.disabled ? 'eye-slash' : 'eye',
-                textIdent: 'moderation.reports.decideModal.submit',
-                callback: () => {
-                  this.confirmCallback(report.resource)
-                },
-              },
-              cancel: {
-                icon: 'close',
-                textIdent: 'moderation.reports.decideModal.cancel',
-                callback: () => {},
-              },
-            },
-          },
-        },
-      })
+      this.commitModalData(this.modalData(report))
     },
   },
   apollo: {

From b22e54181ab8582a109acfc56642078879467d1b Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Mon, 2 Dec 2019 21:07:12 +0100
Subject: [PATCH 145/174] Fix cucumber test

---
 features/support/steps.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/features/support/steps.js b/features/support/steps.js
index a8ea23234..923dc9766 100644
--- a/features/support/steps.js
+++ b/features/support/steps.js
@@ -13,7 +13,10 @@ After(async () => {
 })
 
 Given('our CLIENT_URI is {string}', function (string) {
-  expect(process.env.CLIENT_URI).toEqual(string)
+  expect(string).toEqual('http://localhost:3000')
+  // This is just for documentation. When you see URLs in the response of
+  // scenarios you, should be able to tell that it's coming from this
+  // environment variable.
 });
 
 Given('we have the following users in our database:', function (dataTable) {

From 75b2785941e9701dcf956a9ca2edcc7c95777044 Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Tue, 3 Dec 2019 00:47:07 +0100
Subject: [PATCH 146/174] Follow @alina-beck's suggestions

---
 webapp/components/User/User.vue | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/webapp/components/User/User.vue b/webapp/components/User/User.vue
index 2860c01d8..918d69cbd 100644
--- a/webapp/components/User/User.vue
+++ b/webapp/components/User/User.vue
@@ -12,18 +12,16 @@
           <hc-avatar class="avatar" :user="user" />
           <div>
             <ds-text class="userinfo">
-              <b class="username">{{ userSlug }}</b>
-              <ds-text v-if="dateTime" size="small" color="soft">
-                <base-icon name="clock" />
-                <client-only>
-                  <hc-relative-date-time :date-time="dateTime" />
-                </client-only>
-                <slot name="dateTime"></slot>
-              </ds-text>
+              <b>{{ userSlug }}</b>
             </ds-text>
           </div>
-          <ds-text align="left" size="small" color="soft">
-            {{  userName | truncate(18) }}
+          <ds-text class="username" align="left" size="small" color="soft">
+            {{ userName | truncate(18) }}
+            <base-icon name="clock" />
+            <template v-if="dateTime">
+              <hc-relative-date-time :date-time="dateTime" />
+              <slot name="dateTime"></slot>
+            </template>
           </ds-text>
         </div>
       </nuxt-link>

From ab066dc8c918cb1a722de0a2a751812882cf4277 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 3 Dec 2019 04:21:46 +0000
Subject: [PATCH 147/174] build(deps-dev): bump css-loader from 3.2.0 to 3.2.1
 in /webapp

Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 3.2.0 to 3.2.1.
- [Release notes](https://github.com/webpack-contrib/css-loader/releases)
- [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/css-loader/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 webapp/package.json |  2 +-
 webapp/yarn.lock    | 60 ++++++++++++++++-----------------------------
 2 files changed, 22 insertions(+), 40 deletions(-)

diff --git a/webapp/package.json b/webapp/package.json
index 764b43097..518b84cd5 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -116,7 +116,7 @@
     "babel-plugin-require-context-hook": "^1.0.0",
     "babel-preset-vue": "~2.0.2",
     "core-js": "~2.6.10",
-    "css-loader": "~3.2.0",
+    "css-loader": "~3.2.1",
     "eslint": "~6.7.2",
     "eslint-config-prettier": "~6.7.0",
     "eslint-config-standard": "~14.1.0",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index 5dd0d3ac9..a29c61a98 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -6377,23 +6377,23 @@ css-has-pseudo@^0.10.0:
     postcss "^7.0.6"
     postcss-selector-parser "^5.0.0-rc.4"
 
-css-loader@^3.0.0, css-loader@^3.2.0, css-loader@~3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-3.2.0.tgz#bb570d89c194f763627fcf1f80059c6832d009b2"
-  integrity sha512-QTF3Ud5H7DaZotgdcJjGMvyDj5F3Pn1j/sC6VBEOVp94cbwqyIBdcs/quzj4MC1BKQSrTpQznegH/5giYbhnCQ==
+css-loader@^3.0.0, css-loader@^3.2.0, css-loader@~3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-3.2.1.tgz#62849b45a414b7bde0bfba17325a026471040eae"
+  integrity sha512-q40kYdcBNzMvkIImCL2O+wk8dh+RGwPPV9Dfz3n7XtOYPXqe2Z6VgtvoxjkLHz02gmhepG9sOAJOUlx+3hHsBg==
   dependencies:
     camelcase "^5.3.1"
     cssesc "^3.0.0"
     icss-utils "^4.1.1"
     loader-utils "^1.2.3"
     normalize-path "^3.0.0"
-    postcss "^7.0.17"
+    postcss "^7.0.23"
     postcss-modules-extract-imports "^2.0.0"
     postcss-modules-local-by-default "^3.0.2"
-    postcss-modules-scope "^2.1.0"
+    postcss-modules-scope "^2.1.1"
     postcss-modules-values "^3.0.0"
-    postcss-value-parser "^4.0.0"
-    schema-utils "^2.0.0"
+    postcss-value-parser "^4.0.2"
+    schema-utils "^2.6.0"
 
 css-prefers-color-scheme@^3.1.1:
   version "3.1.1"
@@ -12764,10 +12764,10 @@ postcss-modules-local-by-default@^3.0.2:
     postcss-selector-parser "^6.0.2"
     postcss-value-parser "^4.0.0"
 
-postcss-modules-scope@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-2.1.0.tgz#ad3f5bf7856114f6fcab901b0502e2a2bc39d4eb"
-  integrity sha512-91Rjps0JnmtUB0cujlc8KIKCsJXWjzuxGeT/+Q2i2HXKZ7nBUeF9YQTZZTNvHVoNYj1AthsjnGLtqDUE0Op79A==
+postcss-modules-scope@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-2.1.1.tgz#33d4fc946602eb5e9355c4165d68a10727689dba"
+  integrity sha512-OXRUPecnHCg8b9xWvldG/jUpRIGPNRka0r4D4j0ESUU2/5IOnpsjfPPmDprM3Ih8CgZ8FXjWqaniK5v4rWt3oQ==
   dependencies:
     postcss "^7.0.6"
     postcss-selector-parser "^6.0.0"
@@ -13055,7 +13055,7 @@ postcss-value-parser@^3.0.0, postcss-value-parser@^3.2.3, postcss-value-parser@^
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281"
   integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==
 
-postcss-value-parser@^4.0.0:
+postcss-value-parser@^4.0.0, postcss-value-parser@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.0.2.tgz#482282c09a42706d1fc9a069b73f44ec08391dc9"
   integrity sha512-LmeoohTpp/K4UiyQCwuGWlONxXamGzCMtFxLq4W1nZVGIQLYvMCJx3yAF9qyyuFpflABI9yVdtJAqbihOsCsJQ==
@@ -13069,28 +13069,10 @@ postcss-values-parser@^2.0.0, postcss-values-parser@^2.0.1:
     indexes-of "^1.0.1"
     uniq "^1.0.1"
 
-postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.2, postcss@^7.0.5, postcss@^7.0.6:
-  version "7.0.16"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.16.tgz#48f64f1b4b558cb8b52c88987724359acb010da2"
-  integrity sha512-MOo8zNSlIqh22Uaa3drkdIAgUGEL+AD1ESiSdmElLUmE2uVDo1QloiT/IfW9qRw8Gw+Y/w69UVMGwbufMSftxA==
-  dependencies:
-    chalk "^2.4.2"
-    source-map "^0.6.1"
-    supports-color "^6.1.0"
-
-postcss@^7.0.17:
-  version "7.0.17"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.17.tgz#4da1bdff5322d4a0acaab4d87f3e782436bad31f"
-  integrity sha512-546ZowA+KZ3OasvQZHsbuEpysvwTZNGJv9EfyCQdsIDltPSWHAeTQ5fQy/Npi2ZDtLI3zs7Ps/p6wThErhm9fQ==
-  dependencies:
-    chalk "^2.4.2"
-    source-map "^0.6.1"
-    supports-color "^6.1.0"
-
-postcss@^7.0.18:
-  version "7.0.18"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.18.tgz#4b9cda95ae6c069c67a4d933029eddd4838ac233"
-  integrity sha512-/7g1QXXgegpF+9GJj4iN7ChGF40sYuGYJ8WZu8DZWnmhQ/G36hfdk3q9LBJmoK+lZ+yzZ5KYpOoxq7LF1BxE8g==
+postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.17, postcss@^7.0.18, postcss@^7.0.2, postcss@^7.0.23, postcss@^7.0.5, postcss@^7.0.6:
+  version "7.0.23"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.23.tgz#9f9759fad661b15964f3cfc3140f66f1e05eadc1"
+  integrity sha512-hOlMf3ouRIFXD+j2VJecwssTwbvsPGJVMzupptg+85WA+i7MwyrydmQAgY3R+m0Bc0exunhbJmijy8u8+vufuQ==
   dependencies:
     chalk "^2.4.2"
     source-map "^0.6.1"
@@ -14403,10 +14385,10 @@ schema-utils@^1.0.0:
     ajv-errors "^1.0.0"
     ajv-keywords "^3.1.0"
 
-schema-utils@^2.0.0, schema-utils@^2.0.1, schema-utils@^2.1.0, schema-utils@^2.2.0, schema-utils@^2.4.1, schema-utils@^2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.5.0.tgz#8f254f618d402cc80257486213c8970edfd7c22f"
-  integrity sha512-32ISrwW2scPXHUSusP8qMg5dLUawKkyV+/qIEV9JdXKx+rsM6mi8vZY8khg2M69Qom16rtroWXD3Ybtiws38gQ==
+schema-utils@^2.0.0, schema-utils@^2.0.1, schema-utils@^2.1.0, schema-utils@^2.2.0, schema-utils@^2.4.1, schema-utils@^2.5.0, schema-utils@^2.6.0:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.1.tgz#eb78f0b945c7bcfa2082b3565e8db3548011dc4f"
+  integrity sha512-0WXHDs1VDJyo+Zqs9TKLKyD/h7yDpHUhEFsM2CzkICFdoX1av+GBq/J2xRTFfsQO5kBfhZzANf2VcIm84jqDbg==
   dependencies:
     ajv "^6.10.2"
     ajv-keywords "^3.4.1"

From 38d7718d600c84dca42be68fdd56ca3f3a2d9106 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 3 Dec 2019 04:22:42 +0000
Subject: [PATCH 148/174] build(deps-dev): bump @storybook/addon-a11y in
 /webapp

Bumps [@storybook/addon-a11y](https://github.com/storybookjs/storybook/tree/HEAD/addons/a11y) from 5.2.7 to 5.2.8.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v5.2.8/addons/a11y)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 webapp/package.json |   2 +-
 webapp/yarn.lock    | 133 ++++----------------------------------------
 2 files changed, 11 insertions(+), 124 deletions(-)

diff --git a/webapp/package.json b/webapp/package.json
index 764b43097..b4fbee515 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -100,7 +100,7 @@
     "@babel/core": "~7.7.4",
     "@babel/plugin-syntax-dynamic-import": "^7.2.0",
     "@babel/preset-env": "~7.7.4",
-    "@storybook/addon-a11y": "^5.2.7",
+    "@storybook/addon-a11y": "^5.2.8",
     "@storybook/addon-actions": "^5.2.6",
     "@storybook/addon-notes": "^5.2.8",
     "@storybook/vue": "~5.2.6",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index 5dd0d3ac9..8415f4e76 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -2043,17 +2043,17 @@
     source-map-support "^0.5.7"
     tslib "^1.9.3"
 
-"@storybook/addon-a11y@^5.2.7":
-  version "5.2.7"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-a11y/-/addon-a11y-5.2.7.tgz#0e35a9bc745e07b86cb70d8075ede5de76711ad6"
-  integrity sha512-DC9edBEt0zA92ZaoUpROvfZFk9gVrMefhEvyDrGvVpmbyI0VTgAL+iCyA0t+YelghkidqNoIIQhA0U9op/HJQw==
+"@storybook/addon-a11y@^5.2.8":
+  version "5.2.8"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-a11y/-/addon-a11y-5.2.8.tgz#30ca043dd376711eed9dd4443410d70754050178"
+  integrity sha512-rIujvSAmXhivMecdTAqIwWQ0PARLBmMBKqdLtCfkfwtRjfASJxEFGWRmRJramx37vIDYWS5r7uHfUpZbYSn6Fg==
   dependencies:
-    "@storybook/addons" "5.2.7"
-    "@storybook/api" "5.2.7"
-    "@storybook/client-logger" "5.2.7"
-    "@storybook/components" "5.2.7"
-    "@storybook/core-events" "5.2.7"
-    "@storybook/theming" "5.2.7"
+    "@storybook/addons" "5.2.8"
+    "@storybook/api" "5.2.8"
+    "@storybook/client-logger" "5.2.8"
+    "@storybook/components" "5.2.8"
+    "@storybook/core-events" "5.2.8"
+    "@storybook/theming" "5.2.8"
     axe-core "^3.3.2"
     common-tags "^1.8.0"
     core-js "^3.0.1"
@@ -2130,19 +2130,6 @@
     global "^4.3.2"
     util-deprecate "^1.0.2"
 
-"@storybook/addons@5.2.7":
-  version "5.2.7"
-  resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-5.2.7.tgz#a868ca0a209aefa8a17718b58327dd3ff37f2d76"
-  integrity sha512-eWRSvs5/28KhU28iWjClfOryRN1IuycFcWEJrRtMOXyf44TTyzEC5PbH35eGh33MpWVJYM+8CUJQqNOxxDVjBw==
-  dependencies:
-    "@storybook/api" "5.2.7"
-    "@storybook/channels" "5.2.7"
-    "@storybook/client-logger" "5.2.7"
-    "@storybook/core-events" "5.2.7"
-    core-js "^3.0.1"
-    global "^4.3.2"
-    util-deprecate "^1.0.2"
-
 "@storybook/addons@5.2.8":
   version "5.2.8"
   resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-5.2.8.tgz#f8bf8bd555b7a69fb1e9a52ab8cdb96384d931ff"
@@ -2202,29 +2189,6 @@
     telejson "^3.0.2"
     util-deprecate "^1.0.2"
 
-"@storybook/api@5.2.7":
-  version "5.2.7"
-  resolved "https://registry.yarnpkg.com/@storybook/api/-/api-5.2.7.tgz#f0c04c975b2c7359ce67a581a178cf1c52ffc1cd"
-  integrity sha512-d0tu8GZTCBQqEr2P75mRrDw6t2LMPVcLETo7Pc02LkOjV5mZ9Q6rObAuUAM/flBQMbv24ioNa9HPk2ilspf/iQ==
-  dependencies:
-    "@storybook/channels" "5.2.7"
-    "@storybook/client-logger" "5.2.7"
-    "@storybook/core-events" "5.2.7"
-    "@storybook/router" "5.2.7"
-    "@storybook/theming" "5.2.7"
-    core-js "^3.0.1"
-    fast-deep-equal "^2.0.1"
-    global "^4.3.2"
-    lodash "^4.17.15"
-    memoizerific "^1.11.3"
-    prop-types "^15.6.2"
-    react "^16.8.3"
-    semver "^6.0.0"
-    shallow-equal "^1.1.0"
-    store2 "^2.7.1"
-    telejson "^3.0.2"
-    util-deprecate "^1.0.2"
-
 "@storybook/api@5.2.8":
   version "5.2.8"
   resolved "https://registry.yarnpkg.com/@storybook/api/-/api-5.2.8.tgz#21f03df8041114eb929bd10b570a17f266568b7f"
@@ -2273,13 +2237,6 @@
   dependencies:
     core-js "^3.0.1"
 
-"@storybook/channels@5.2.7":
-  version "5.2.7"
-  resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-5.2.7.tgz#7cd55f1a25c68588795ddc6cbe5bb53ee8f8bb69"
-  integrity sha512-q3+fxc6aBU60XaihVJ2P2xrVOiCgimTTEzt1KkRr5ZzD27m4LnF0iDaVnJSlEJv7PpaqqewUb6lHhsQLjfWKMg==
-  dependencies:
-    core-js "^3.0.1"
-
 "@storybook/channels@5.2.8":
   version "5.2.8"
   resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-5.2.8.tgz#79a99ad85dcacb688073c22340c5b7d16b801202"
@@ -2322,13 +2279,6 @@
   dependencies:
     core-js "^3.0.1"
 
-"@storybook/client-logger@5.2.7":
-  version "5.2.7"
-  resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-5.2.7.tgz#aa8bdcfc0a981d8505e60ec1548436eabd28e64e"
-  integrity sha512-gomUNoc5bBl+YEJhrHMr5anmu4k8/AYmF5omp5OaWaF74HfH/a33L8p4L7yHdFWK7zpqlfi6SrBl3gptzvnljA==
-  dependencies:
-    core-js "^3.0.1"
-
 "@storybook/client-logger@5.2.8":
   version "5.2.8"
   resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-5.2.8.tgz#5affe2f9dbbee374721fd2e8729116f5ac39c779"
@@ -2385,31 +2335,6 @@
     react-textarea-autosize "^7.1.0"
     simplebar-react "^1.0.0-alpha.6"
 
-"@storybook/components@5.2.7":
-  version "5.2.7"
-  resolved "https://registry.yarnpkg.com/@storybook/components/-/components-5.2.7.tgz#810327a517dc839293ef1d684f960a548e257689"
-  integrity sha512-BRmfSMXqiDDWwgYKTyq0XseCYhETvlBzljAqIeI+xuSPh4FzRY1uoXrD3yJJo/jtEfP+vtEV98/6g3pmZf3pBw==
-  dependencies:
-    "@storybook/client-logger" "5.2.7"
-    "@storybook/theming" "5.2.7"
-    "@types/react-syntax-highlighter" "10.1.0"
-    "@types/react-textarea-autosize" "^4.3.3"
-    core-js "^3.0.1"
-    global "^4.3.2"
-    markdown-to-jsx "^6.9.1"
-    memoizerific "^1.11.3"
-    polished "^3.3.1"
-    popper.js "^1.14.7"
-    prop-types "^15.7.2"
-    react "^16.8.3"
-    react-dom "^16.8.3"
-    react-focus-lock "^1.18.3"
-    react-helmet-async "^1.0.2"
-    react-popper-tooltip "^2.8.3"
-    react-syntax-highlighter "^8.0.1"
-    react-textarea-autosize "^7.1.0"
-    simplebar-react "^1.0.0-alpha.6"
-
 "@storybook/components@5.2.8":
   version "5.2.8"
   resolved "https://registry.yarnpkg.com/@storybook/components/-/components-5.2.8.tgz#f5d4a06ba4ba8c700b2d962deae182105b72fb99"
@@ -2449,13 +2374,6 @@
   dependencies:
     core-js "^3.0.1"
 
-"@storybook/core-events@5.2.7":
-  version "5.2.7"
-  resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-5.2.7.tgz#624a4ea04f62e7002871b4d13892970955859401"
-  integrity sha512-DZG/CdLhINmnSysBEFTMyUPiXGuhtsxZA+v2yO3X09IHai/LWXW6Diyiz+h81m4z2w/SYQeoD96wZ9wNbyaYwA==
-  dependencies:
-    core-js "^3.0.1"
-
 "@storybook/core-events@5.2.8":
   version "5.2.8"
   resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-5.2.8.tgz#93fc458ea0820ff1409d268b0fe51abba200f5a4"
@@ -2572,19 +2490,6 @@
     memoizerific "^1.11.3"
     qs "^6.6.0"
 
-"@storybook/router@5.2.7":
-  version "5.2.7"
-  resolved "https://registry.yarnpkg.com/@storybook/router/-/router-5.2.7.tgz#4c9e48667a1e23a86a9fdd5810722e73b12f35f5"
-  integrity sha512-6xXAjc+4OtLXEGFacFKHpUDooZlRODwLSGYL0UDuPMpFwBDPZvuIaNtG18m3yhAgjWqoH7kS/bwKwtosno9/xg==
-  dependencies:
-    "@reach/router" "^1.2.1"
-    "@types/reach__router" "^1.2.3"
-    core-js "^3.0.1"
-    global "^4.3.2"
-    lodash "^4.17.15"
-    memoizerific "^1.11.3"
-    qs "^6.6.0"
-
 "@storybook/router@5.2.8":
   version "5.2.8"
   resolved "https://registry.yarnpkg.com/@storybook/router/-/router-5.2.8.tgz#d7de2d401701857c033e28560c30e16512f7f72f"
@@ -2634,24 +2539,6 @@
     prop-types "^15.7.2"
     resolve-from "^5.0.0"
 
-"@storybook/theming@5.2.7":
-  version "5.2.7"
-  resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-5.2.7.tgz#8db0f7e1b2c4c17befbf4bcd7c60f75ff4369105"
-  integrity sha512-MroOG2lUB8dPZu8ZKwAuP8NV4ozG/8FpkWHZ/1HtBAAtGCvVNrXuSKIvI/pabfJaJvms+1uh95K7riY8t7CUWw==
-  dependencies:
-    "@emotion/core" "^10.0.14"
-    "@emotion/styled" "^10.0.14"
-    "@storybook/client-logger" "5.2.7"
-    common-tags "^1.8.0"
-    core-js "^3.0.1"
-    deep-object-diff "^1.1.0"
-    emotion-theming "^10.0.14"
-    global "^4.3.2"
-    memoizerific "^1.11.3"
-    polished "^3.3.1"
-    prop-types "^15.7.2"
-    resolve-from "^5.0.0"
-
 "@storybook/theming@5.2.8":
   version "5.2.8"
   resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-5.2.8.tgz#a4c9e0e9a5789c1aa71e4fcb7a8ee86efe3dadcf"

From bd34a86569d65408df82bd605e643fc268c67c02 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 3 Dec 2019 04:23:18 +0000
Subject: [PATCH 149/174] build(deps): bump tiptap-extensions from 1.28.4 to
 1.28.5 in /webapp

Bumps [tiptap-extensions](https://github.com/scrumpy/tiptap) from 1.28.4 to 1.28.5.
- [Release notes](https://github.com/scrumpy/tiptap/releases)
- [Commits](https://github.com/scrumpy/tiptap/compare/tiptap-extensions@1.28.4...tiptap-extensions@1.28.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 webapp/package.json |   2 +-
 webapp/yarn.lock    | 268 ++++++++++++++++++++++----------------------
 2 files changed, 135 insertions(+), 135 deletions(-)

diff --git a/webapp/package.json b/webapp/package.json
index 764b43097..857e7af37 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -83,7 +83,7 @@
     "string-hash": "^1.1.3",
     "tippy.js": "^4.3.5",
     "tiptap": "~1.26.3",
-    "tiptap-extensions": "~1.28.4",
+    "tiptap-extensions": "~1.28.5",
     "trunc-html": "^1.1.2",
     "v-tooltip": "~2.0.2",
     "validator": "^12.1.0",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index 5dd0d3ac9..408ee7626 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -8818,10 +8818,10 @@ highlight.js@~9.12.0:
   resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.12.0.tgz#e6d9dbe57cbefe60751f02af336195870c90c01e"
   integrity sha1-5tnb5Xy+/mB1HwKvM2GVhwyQwB4=
 
-highlight.js@~9.15.0:
-  version "9.15.6"
-  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.15.6.tgz#72d4d8d779ec066af9a17cb14360c3def0aa57c4"
-  integrity sha512-zozTAWM1D6sozHo8kqhfYgsac+B+q0PmsjXeyDrYIHHcBN0zTVT66+s2GW1GZv7DbyaROdLXKdabwS/WqPyIdQ==
+highlight.js@~9.16.0:
+  version "9.16.2"
+  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.16.2.tgz#68368d039ffe1c6211bcc07e483daf95de3e403e"
+  integrity sha512-feMUrVLZvjy0oC7FVJQcSQRqbBq9kwqnYE4+Kj9ZjbHh3g+BisiPgF49NyQbVLNdrL/qqZr3Ca9yOKwgn2i/tw==
 
 hmac-drbg@^1.0.0:
   version "1.0.1"
@@ -10863,13 +10863,13 @@ lowercase-keys@^1.0.0:
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
   integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==
 
-lowlight@^1.12.1:
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/lowlight/-/lowlight-1.12.1.tgz#014acf8dd73a370e02ff1cc61debcde3bb1681eb"
-  integrity sha512-OqaVxMGIESnawn+TU/QMV5BJLbUghUfjDWPAtFqDYDmDtr4FnB+op8xM+pR7nKlauHNUHXGt0VgWatFB8voS5w==
+lowlight@1.13.0:
+  version "1.13.0"
+  resolved "https://registry.yarnpkg.com/lowlight/-/lowlight-1.13.0.tgz#9b4fd00559985e40e11c916ccab14c7c0cf4320d"
+  integrity sha512-bFXLa+UO1eM3zieFAcNqf6rTQ1D5ERFv64/euQbbH/LT3U9XXwH6tOrgUAGWDsQ1QgN3ZhgOcv8p3/S+qKGdTQ==
   dependencies:
     fault "^1.0.2"
-    highlight.js "~9.15.0"
+    highlight.js "~9.16.0"
 
 lowlight@~1.9.1:
   version "1.9.2"
@@ -11954,10 +11954,10 @@ ora@^3.4.0:
     strip-ansi "^5.2.0"
     wcwidth "^1.0.1"
 
-orderedmap@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/orderedmap/-/orderedmap-1.0.0.tgz#d90fc2ba1ed085190907d601dec6e6a53f8d41ba"
-  integrity sha1-2Q/Cuh7QhRkJB9YB3sbmpT+NQbo=
+orderedmap@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/orderedmap/-/orderedmap-1.1.0.tgz#dc41a147130b51e203e8523ea5ea57724af2b63d"
+  integrity sha512-abUlPCcmyI/17BWWoUWeAbnniTFUZuczP6iowD9XMBcUoD9jRtUO6w+KXkw64TDk+iHdyDfTAjIH7mTRzhXcaw==
 
 original@^1.0.0:
   version "1.0.2"
@@ -13251,58 +13251,66 @@ property-information@^5.0.1:
   dependencies:
     xtend "^4.0.1"
 
-prosemirror-collab@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/prosemirror-collab/-/prosemirror-collab-1.1.2.tgz#622fdc52692a83045ba6914c01a0416ff35f646a"
-  integrity sha512-ew0p0XWlp3PYc4h20hOfix8UPSRaJMRHQQCMoIUzxoiBgGGij/N4pXIY+w/iw5JISgP8QYyOy5arOYnCzFJQlQ==
+prosemirror-collab@1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/prosemirror-collab/-/prosemirror-collab-1.2.2.tgz#8d2c0e82779cfef5d051154bd0836428bd6d9c4a"
+  integrity sha512-tBnHKMLgy5Qmx9MYVcLfs3pAyjtcqYYDd9kp3y+LSiQzkhMQDfZSV3NXWe4Gsly32adSef173BvObwfoSQL5MA==
   dependencies:
     prosemirror-state "^1.0.0"
 
-prosemirror-commands@^1.0.8:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/prosemirror-commands/-/prosemirror-commands-1.0.8.tgz#3b21e8b2f2e1c04ddb831b2d4055084b6d627bcc"
-  integrity sha512-P9QdkYYBHWsrJ1JztQuHgeZS7DPCcijQduOj9oxFiqK8Fm6eTsVHzU1IwiRBe+FlK7tyQaerhu/F5K8sqnZ1Cw==
+prosemirror-commands@1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/prosemirror-commands/-/prosemirror-commands-1.1.2.tgz#6868cabc9f9112fba94c805139473527774b0dea"
+  integrity sha512-JBa06kjgX67d9JVUVJbCkxwvSGtQnWAN/85nq9csOMS5Z9WZLEvVDtVvZranNlu8l/XNVBWrZxOOK+pB03eTfA==
   dependencies:
     prosemirror-model "^1.0.0"
     prosemirror-state "^1.0.0"
     prosemirror-transform "^1.0.0"
 
-prosemirror-dropcursor@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/prosemirror-dropcursor/-/prosemirror-dropcursor-1.2.0.tgz#00b1bdb803ac28f5a68d7e0a16a47c9c11aab97d"
-  integrity sha512-D7JrvOgN32PmOgfimdDMKCuYp4tGyCulpsd39/Nzvn9A+tCJmM8XY1PB07zkr2vjrjF09WYD3Ifer7Z3pk/YRw==
+prosemirror-dropcursor@1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/prosemirror-dropcursor/-/prosemirror-dropcursor-1.3.2.tgz#28738c4ed7102e814d7a8a26d70018523fc7cd6d"
+  integrity sha512-4c94OUGyobGnwcQI70OXyMhE/9T4aTgjU+CHxkd5c7D+jH/J0mKM/lk+jneFVKt7+E4/M0D9HzRPifu8U28Thw==
   dependencies:
     prosemirror-state "^1.0.0"
     prosemirror-transform "^1.1.0"
     prosemirror-view "^1.1.0"
 
-prosemirror-gapcursor@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/prosemirror-gapcursor/-/prosemirror-gapcursor-1.0.4.tgz#4ba663fb8511616e18ad222c904403cfbf6866dc"
-  integrity sha512-k021MtJibWs3NaJI6S9tCXfTZ/kaugFZBndHkkWx3Zfk0QDUO6JfVATpflxADN6DUkRwJ7qWyHlLDWu71hxHFQ==
+prosemirror-gapcursor@1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/prosemirror-gapcursor/-/prosemirror-gapcursor-1.1.2.tgz#a1400a86a51d4cccc065e68d5625a9fb5bc623e0"
+  integrity sha512-Z+eqk6RysZVxidGWN5aWoSTbn5bTHf1XZ+nQJVwUSdwdBVkfQMFdTHgfrXA8W5MhHHdNg/EEEYG3z3Zi/vE2QQ==
   dependencies:
     prosemirror-keymap "^1.0.0"
     prosemirror-model "^1.0.0"
     prosemirror-state "^1.0.0"
     prosemirror-view "^1.0.0"
 
-prosemirror-history@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/prosemirror-history/-/prosemirror-history-1.0.4.tgz#313a15489a78795321f3a37d53d8c68610c5adb6"
-  integrity sha512-Kk2UisC9EzYcsNv+ILiQJWpsu0rbT6+oAAkvseFUHnudtfkmYAJu1+Xp3F0xTTCVmQdSqSLVk8qydllXUUOU4Q==
+prosemirror-history@1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/prosemirror-history/-/prosemirror-history-1.1.2.tgz#3e8f11efbd316e98322028be67549df1f94fc6da"
+  integrity sha512-erhxYS5gm/6MiXP8jUoJBgc8IbaqjHDVPl9KGg5JrMZOSSOwHv85+4Fb0Q7sYtv2fYwAjOSw/kSA9vkxJ6wOwA==
   dependencies:
     prosemirror-state "^1.2.2"
     prosemirror-transform "^1.0.0"
-    rope-sequence "^1.2.0"
+    rope-sequence "^1.3.0"
 
-prosemirror-inputrules@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/prosemirror-inputrules/-/prosemirror-inputrules-1.0.4.tgz#8ae84d9c147abb448b86063ff422e801c4b1658d"
-  integrity sha512-RhuBghqUgYWm8ai/P+k1lMl1ZGvt6Cs3Xeur8oN0L1Yy+Z5GmsTp3fT8RVl+vJeGkItEAxAit9Qh7yZxixX7rA==
+prosemirror-inputrules@1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/prosemirror-inputrules/-/prosemirror-inputrules-1.1.2.tgz#487e46c763e1212a4577397aba7706139084f012"
+  integrity sha512-Ja5Z3BWestlHYGvtSGqyvxMeB8QEuBjlHM8YnKtLGUXMDp965qdDV4goV8lJb17kIWHk7e7JNj6Catuoa3302g==
   dependencies:
     prosemirror-state "^1.0.0"
     prosemirror-transform "^1.0.0"
 
+prosemirror-keymap@1.1.3, prosemirror-keymap@^1.1.2:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/prosemirror-keymap/-/prosemirror-keymap-1.1.3.tgz#be22d6108df2521608e9216a87b1a810f0ed361e"
+  integrity sha512-PRA4NzkUMzV/NFf5pyQ6tmlIHiW/qjQ1kGWUlV2rF/dvlOxtpGpTEjIMhWgLuMf+HiDEFnUEP7uhYXu+t+491g==
+  dependencies:
+    prosemirror-state "^1.0.0"
+    w3c-keyname "^2.2.0"
+
 prosemirror-keymap@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/prosemirror-keymap/-/prosemirror-keymap-1.0.1.tgz#03ef32b828e3a859dfb570eb84928bf2e5330bc2"
@@ -13311,64 +13319,56 @@ prosemirror-keymap@^1.0.0:
     prosemirror-state "^1.0.0"
     w3c-keyname "^1.1.8"
 
-prosemirror-keymap@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/prosemirror-keymap/-/prosemirror-keymap-1.0.2.tgz#e4e8b876a586ec6a170615fce19c4450f4075bef"
-  integrity sha512-aq3fBT3WMbwGNacUtMbS/mxd87hjJyjtUx5/h3q/P3FiVqHxmeA9snxQsZHYe0cWRziZePun8zw6kHFKLp/DAQ==
+prosemirror-model@1.8.2, prosemirror-model@^1.0.0, prosemirror-model@^1.1.0, prosemirror-model@^1.8.1:
+  version "1.8.2"
+  resolved "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.8.2.tgz#c74eaacb0bbfea49b59a6d89fef5516181666a56"
+  integrity sha512-piffokzW7opZVCjf/9YaoXvTC0g7zMRWKJib1hpphPfC+4x6ZXe5CiExgycoWZJe59VxxP7uHX8aFiwg2i9mUQ==
   dependencies:
-    prosemirror-state "^1.0.0"
-    w3c-keyname "^2.0.0"
+    orderedmap "^1.1.0"
 
-prosemirror-model@^1.0.0, prosemirror-model@^1.1.0, prosemirror-model@^1.7.4:
-  version "1.7.4"
-  resolved "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.7.4.tgz#fadefad98ef9d71ca1749d18a82005313c978e4b"
-  integrity sha512-yxdpPh9Uv5vAOZvmbhg4fsGUK1oHuQs69iX7cFZ0A4Y+AyMMWRCNKUt21uv84HbXb4I180l4pJE8ibaH/SwYiw==
-  dependencies:
-    orderedmap "^1.0.0"
-
-prosemirror-schema-list@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/prosemirror-schema-list/-/prosemirror-schema-list-1.0.4.tgz#cbb11936e306aa45586af4279529ce61b52cfb6e"
-  integrity sha512-7Y0b6FIG6ATnCcDSLrZfU9yIfOG5Yad3DMNZ9W7GGfMSzdIl0aHExrsIUgviJZjovO2jtLJVbxWGjMR3OrTupA==
+prosemirror-schema-list@1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/prosemirror-schema-list/-/prosemirror-schema-list-1.1.2.tgz#310809209094b03425da7f5c337105074913da6c"
+  integrity sha512-dgM9PwtM4twa5WsgSYMB+J8bwjnR43DAD3L9MsR9rKm/nZR5Y85xcjB7gusVMSsbQ2NomMZF03RE6No6mTnclQ==
   dependencies:
     prosemirror-model "^1.0.0"
     prosemirror-transform "^1.0.0"
 
-prosemirror-state@^1.0.0, prosemirror-state@^1.2.2, prosemirror-state@^1.2.4:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/prosemirror-state/-/prosemirror-state-1.2.4.tgz#aab932ebb33a0f27c256abce6fc20da8ca77ad5e"
-  integrity sha512-ViXpXond3BbSL12ENARQGq3Y8igwFMbTcy96xUNK8kfIcfQRlYlgYrBPXIkHC5+QZtbPrYlpuJ2+QyeSlSX9Cw==
+prosemirror-state@1.3.2, prosemirror-state@^1.0.0, prosemirror-state@^1.2.2, prosemirror-state@^1.3.1:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/prosemirror-state/-/prosemirror-state-1.3.2.tgz#1b910b0dc01c1f00926bb9ba1589f7b7ac0d658b"
+  integrity sha512-t/JqE3aR0SV9QrzFVkAXsQwsgrQBNs/BDbcFH20RssW0xauqNNdjTXxy/J/kM7F+0zYi6+BRmz7cMMQQFU3mwQ==
   dependencies:
     prosemirror-model "^1.0.0"
     prosemirror-transform "^1.0.0"
 
-prosemirror-tables@^0.9.5:
-  version "0.9.5"
-  resolved "https://registry.yarnpkg.com/prosemirror-tables/-/prosemirror-tables-0.9.5.tgz#94d9881a46051e6fff3c51edffafa346da084def"
-  integrity sha512-RlAF/D7OvnDCOL8B6Qt6KuBkb0w3SedTdrou7wH7Nn2ml7+M5xUalW/h1f7dMD3wjsU47/Cn8zTbEkCDIpIggw==
+prosemirror-tables@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/prosemirror-tables/-/prosemirror-tables-1.0.0.tgz#ec3d0b11e638c6a92dd14ae816d0a2efd1719b70"
+  integrity sha512-zFw5Us4G5Vdq0yIj8GiqZOGA6ud5UKpMKElux9O0HrfmhkuGa1jf1PCpz2R5pmIQJv+tIM24H1mox/ODBAX37Q==
   dependencies:
-    prosemirror-keymap "^1.0.0"
-    prosemirror-model "^1.0.0"
-    prosemirror-state "^1.0.0"
-    prosemirror-transform "^1.0.0"
-    prosemirror-view "^1.0.0"
+    prosemirror-keymap "^1.1.2"
+    prosemirror-model "^1.8.1"
+    prosemirror-state "^1.3.1"
+    prosemirror-transform "^1.2.1"
+    prosemirror-view "^1.13.3"
 
-prosemirror-transform@^1.0.0, prosemirror-transform@^1.1.0, prosemirror-transform@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/prosemirror-transform/-/prosemirror-transform-1.1.5.tgz#e50113d8004854eca1fa0711806bca53b1f1fad9"
-  integrity sha512-hJyRcwykLrAAj/ziNbVK1P/ensiszWJ2fNwNiDM8ZWYiMPwM4cAd2jptj/znxJfIvaj0S0psWL1+VhKwPNJDSQ==
+prosemirror-transform@1.2.2, prosemirror-transform@^1.0.0, prosemirror-transform@^1.1.0, prosemirror-transform@^1.2.1:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/prosemirror-transform/-/prosemirror-transform-1.2.2.tgz#4439ae7e88ea1395d9beed6a4cd852d72b16ed2f"
+  integrity sha512-expO11jAsxaHk2RdZtzPsumc1bAAZi4UiXwTLQbftsdnIUWZE5Snyag595p1lx/B8QHUZ6tYWWOaOkzXKoJmYw==
   dependencies:
     prosemirror-model "^1.0.0"
 
-prosemirror-utils@^0.9.6:
+prosemirror-utils@0.9.6:
   version "0.9.6"
   resolved "https://registry.yarnpkg.com/prosemirror-utils/-/prosemirror-utils-0.9.6.tgz#3d97bd85897e3b535555867dc95a51399116a973"
   integrity sha512-UC+j9hQQ1POYfMc5p7UFxBTptRiGPR7Kkmbl3jVvU8VgQbkI89tR/GK+3QYC8n+VvBZrtAoCrJItNhWSxX3slA==
 
-prosemirror-view@^1.0.0, prosemirror-view@^1.1.0, prosemirror-view@^1.11.7:
-  version "1.11.7"
-  resolved "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.11.7.tgz#537020acab43e18d51e18717fb1f39466317ce21"
-  integrity sha512-RDll1mhrOQ5JPOsUZlISH3VP/4zyHm3RAuqh9Cg5HdpfSQow0nsx8xL5YQZ976UdhvwbkiKamLtxhSRKES9wsA==
+prosemirror-view@1.13.4, prosemirror-view@^1.0.0, prosemirror-view@^1.1.0, prosemirror-view@^1.13.3:
+  version "1.13.4"
+  resolved "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.13.4.tgz#01d873db7731e0aacc410a9038447d1b7536fd07"
+  integrity sha512-mtgWEK16uYQFk3kijRlkSpAmDuy7rxYuv0pgyEBDmLT1PCPY8380CoaYnP8znUT6BXIGlJ8oTveK3M50U+B0vw==
   dependencies:
     prosemirror-model "^1.1.0"
     prosemirror-state "^1.0.0"
@@ -14259,10 +14259,10 @@ ripemd160@^2.0.0, ripemd160@^2.0.1:
     hash-base "^3.0.0"
     inherits "^2.0.1"
 
-rope-sequence@^1.2.0:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/rope-sequence/-/rope-sequence-1.2.2.tgz#49c4e5c2f54a48e990b050926771e2871bcb31ce"
-  integrity sha1-ScTlwvVKSOmQsFCSZ3HihxvLMc4=
+rope-sequence@^1.3.0:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/rope-sequence/-/rope-sequence-1.3.2.tgz#a19e02d72991ca71feb6b5f8a91154e48e3c098b"
+  integrity sha512-ku6MFrwEVSVmXLvy3dYph3LAMNS0890K7fabn+0YIRQ2T96T9F4gkFf0vf0WW0JUraNWwGRtInEpH7yO4tbQZg==
 
 rsvp@^4.8.4:
   version "4.8.4"
@@ -15788,62 +15788,62 @@ tippy.js@^4.3.5:
   dependencies:
     popper.js "^1.14.7"
 
-tiptap-commands@^1.12.3:
-  version "1.12.3"
-  resolved "https://registry.yarnpkg.com/tiptap-commands/-/tiptap-commands-1.12.3.tgz#604767878073e6344d1daf7a376fd89fc62e4742"
-  integrity sha512-Dck51lePBwuHmkvkJ6+8V3DbInxAhZwtS2mPvVwz74pDUIcy17tCFw1eHUN50JoXIAci7acuxPKO/weVO1JAyw==
+tiptap-commands@^1.12.4:
+  version "1.12.4"
+  resolved "https://registry.yarnpkg.com/tiptap-commands/-/tiptap-commands-1.12.4.tgz#03ef3eda290f0d2ed71a54d73d7619452b05dced"
+  integrity sha512-szgSZzd/5FHn3Hs02zxySLxNEwNqbyqPOmz5NEAkIJmcyatTkuL+RQDKHA/RNQRUT66SsUCrEXgL1osTqdOSyQ==
   dependencies:
-    prosemirror-commands "^1.0.8"
-    prosemirror-inputrules "^1.0.4"
-    prosemirror-model "^1.7.4"
-    prosemirror-schema-list "^1.0.4"
-    prosemirror-state "^1.2.4"
-    prosemirror-tables "^0.9.5"
-    prosemirror-utils "^0.9.6"
-    tiptap-utils "^1.8.2"
+    prosemirror-commands "1.1.2"
+    prosemirror-inputrules "1.1.2"
+    prosemirror-model "1.8.2"
+    prosemirror-schema-list "1.1.2"
+    prosemirror-state "1.3.2"
+    prosemirror-tables "1.0.0"
+    prosemirror-utils "0.9.6"
+    tiptap-utils "^1.8.3"
 
-tiptap-extensions@~1.28.4:
-  version "1.28.4"
-  resolved "https://registry.yarnpkg.com/tiptap-extensions/-/tiptap-extensions-1.28.4.tgz#0e729d081a80105730101512e7eb5acdce8b9bde"
-  integrity sha512-UAtxngKifjrMtJFmi3D9RCNC5LJutq4yn1Np0cqJ4dTnvhWR49PqN6gKjlMYyzyutiLLQk+/3GM/E6EfVwmHOA==
+tiptap-extensions@~1.28.5:
+  version "1.28.5"
+  resolved "https://registry.yarnpkg.com/tiptap-extensions/-/tiptap-extensions-1.28.5.tgz#6fba6f7c61abd82729f413f3afa68438b0ba8dd7"
+  integrity sha512-WvwRvznzgELeSA9JIFse4xNlDEcQ0JMN2PV2sybyPamKM1cvqrYBwF6fqf+EKGmrvwJzmr33CFZpMuzrMeAmWw==
   dependencies:
-    lowlight "^1.12.1"
-    prosemirror-collab "^1.1.2"
-    prosemirror-history "^1.0.4"
-    prosemirror-model "^1.7.4"
-    prosemirror-state "^1.2.4"
-    prosemirror-tables "^0.9.5"
-    prosemirror-transform "^1.1.5"
-    prosemirror-utils "^0.9.6"
-    prosemirror-view "^1.11.7"
-    tiptap "^1.26.4"
-    tiptap-commands "^1.12.3"
+    lowlight "1.13.0"
+    prosemirror-collab "1.2.2"
+    prosemirror-history "1.1.2"
+    prosemirror-model "1.8.2"
+    prosemirror-state "1.3.2"
+    prosemirror-tables "1.0.0"
+    prosemirror-transform "1.2.2"
+    prosemirror-utils "0.9.6"
+    prosemirror-view "1.13.4"
+    tiptap "^1.26.5"
+    tiptap-commands "^1.12.4"
 
-tiptap-utils@^1.8.2:
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/tiptap-utils/-/tiptap-utils-1.8.2.tgz#f07a2053c6ac9fbbb4f02e0844b326d0e6c8b7fb"
-  integrity sha512-pyx+3p4fICGM7JU1mcsnRx5jXvLrCL8Nm/9yjeWEZXpAC85L/btY0eFo2Oz4+dKg39+1EGNHheodujx3ngw4lQ==
+tiptap-utils@^1.8.3:
+  version "1.8.3"
+  resolved "https://registry.yarnpkg.com/tiptap-utils/-/tiptap-utils-1.8.3.tgz#fdfc8f7888f6e9ed0dae081f5f66b9f5429608a9"
+  integrity sha512-SgqDTCA5ux17KKTpEV2YC54ugBWU2jzpiFlCmVckPjYl5BhmOwuJ1Q5H/8v/XGcnHDqP31Ui4lk31Vts4NmtTA==
   dependencies:
-    prosemirror-model "^1.7.4"
-    prosemirror-state "^1.2.4"
-    prosemirror-tables "^0.9.5"
-    prosemirror-utils "^0.9.6"
+    prosemirror-model "1.8.2"
+    prosemirror-state "1.3.2"
+    prosemirror-tables "1.0.0"
+    prosemirror-utils "0.9.6"
 
-tiptap@^1.26.4, tiptap@~1.26.3:
-  version "1.26.4"
-  resolved "https://registry.yarnpkg.com/tiptap/-/tiptap-1.26.4.tgz#bfa289841bc45c6401cbd1661a02b81c3d3f14f0"
-  integrity sha512-UCH0wufjGdKMuCUydL896sFYXEUWC3bE20h/oONABSf0gull+pqBEm7J1yCl7j50eYa9FiLgUBGPqPTzKLluxQ==
+tiptap@^1.26.5, tiptap@~1.26.3:
+  version "1.26.5"
+  resolved "https://registry.yarnpkg.com/tiptap/-/tiptap-1.26.5.tgz#d35f000e0bf93d97532357a29692fa7655e396da"
+  integrity sha512-PTm9w/UGDQTq6TEjyrNCpNBq9+ZbNU8aZrl+5KLLcmVyMpWCXRd/29b7nKqil8cmi0zUlLrQb9vHteExEgyyrg==
   dependencies:
-    prosemirror-commands "^1.0.8"
-    prosemirror-dropcursor "^1.2.0"
-    prosemirror-gapcursor "^1.0.4"
-    prosemirror-inputrules "^1.0.4"
-    prosemirror-keymap "^1.0.2"
-    prosemirror-model "^1.7.4"
-    prosemirror-state "^1.2.4"
-    prosemirror-view "^1.11.7"
-    tiptap-commands "^1.12.3"
-    tiptap-utils "^1.8.2"
+    prosemirror-commands "1.1.2"
+    prosemirror-dropcursor "1.3.2"
+    prosemirror-gapcursor "1.1.2"
+    prosemirror-inputrules "1.1.2"
+    prosemirror-keymap "1.1.3"
+    prosemirror-model "1.8.2"
+    prosemirror-state "1.3.2"
+    prosemirror-view "1.13.4"
+    tiptap-commands "^1.12.4"
+    tiptap-utils "^1.8.3"
 
 title-case@^2.1.0:
   version "2.1.1"
@@ -16718,10 +16718,10 @@ w3c-keyname@^1.1.8:
   resolved "https://registry.yarnpkg.com/w3c-keyname/-/w3c-keyname-1.1.8.tgz#4e2219663760fd6535b7a1550f1552d71fc9372c"
   integrity sha512-2HAdug8GTiu3b4NYhssdtY8PXRue3ICnh1IlxvZYl+hiINRq0GfNWei3XOPDg8L0PsxbmYjWVLuLj6BMRR/9vA==
 
-w3c-keyname@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/w3c-keyname/-/w3c-keyname-2.1.1.tgz#d234195b0a79913d06a0bc636f17f00050a5de56"
-  integrity sha512-8kSrsGClLiL4kb5/pTxglejUlEAPk3GXtkBblSMrQDxKz0NkMRTVTPBZm6QCNqPOCPsdNvae5XfV+RJZgeGXEA==
+w3c-keyname@^2.2.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/w3c-keyname/-/w3c-keyname-2.2.1.tgz#c4fe1a4b9e303c95e833b3d854b7d81070400db9"
+  integrity sha512-j5k4xGK6k8TCna/08778KUEL98WvTogiG/TN/YStl8GNeXg5tI3Dvq3+JjwJhP4l7ogs6KWo1VYEdc1Qaioy3Q==
 
 walker@^1.0.7, walker@~1.0.5:
   version "1.0.7"

From 150ffef35a764436749ba814308d8d16d5fd530b Mon Sep 17 00:00:00 2001
From: Alina Beck <alina.beck@mail.com>
Date: Tue, 3 Dec 2019 11:37:58 +0300
Subject: [PATCH 150/174] style report list header

---
 .../_new/features/ReportList/ReportList.vue   | 30 +++++++++++--------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/webapp/components/_new/features/ReportList/ReportList.vue b/webapp/components/_new/features/ReportList/ReportList.vue
index c4269ac13..65c8fdc95 100644
--- a/webapp/components/_new/features/ReportList/ReportList.vue
+++ b/webapp/components/_new/features/ReportList/ReportList.vue
@@ -1,16 +1,11 @@
 <template>
-  <ds-card space="small">
-    <ds-flex class="notifications-page-flex">
-      <ds-flex-item :width="{ lg: '85%' }">
-        <ds-heading tag="h3">{{ $t('moderation.reports.name') }}</ds-heading>
-      </ds-flex-item>
-      <ds-flex-item width="110px">
-        <client-only>
-          <dropdown-filter @filter="filter" :filterOptions="filterOptions" :selected="selected" />
-        </client-only>
-      </ds-flex-item>
-    </ds-flex>
-    <ds-space />
+  <ds-card>
+    <div class="report-list-header">
+      <h3 class="title">{{ $t('moderation.reports.name') }}</h3>
+      <client-only>
+        <dropdown-filter @filter="filter" :filterOptions="filterOptions" :selected="selected" />
+      </client-only>
+    </div>
     <reports-table :reports="reports" @confirm="confirm" />
   </ds-card>
 </template>
@@ -137,6 +132,17 @@ export default {
 </script>
 
 <style lang="scss">
+.report-list-header {
+  display: flex;
+  justify-content: space-between;
+  margin: $space-small 0;
+
+  > .title {
+    margin: 0;
+    font-size: $font-size-large;
+  }
+}
+
 .decision {
   color: $color-secondary;
 }

From 7669586690b0e226541984a9f3147f2a94f00ffd Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 3 Dec 2019 08:41:36 +0000
Subject: [PATCH 151/174] build(deps-dev): bump @storybook/addon-actions in
 /webapp

Bumps [@storybook/addon-actions](https://github.com/storybookjs/storybook/tree/HEAD/addons/actions) from 5.2.6 to 5.2.8.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v5.2.8/addons/actions)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 webapp/package.json |  2 +-
 webapp/yarn.lock    | 53 ++++++++++++++++++++++++++++++++++++---------
 2 files changed, 44 insertions(+), 11 deletions(-)

diff --git a/webapp/package.json b/webapp/package.json
index aadde468c..83e94ffe6 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -101,7 +101,7 @@
     "@babel/plugin-syntax-dynamic-import": "^7.2.0",
     "@babel/preset-env": "~7.7.4",
     "@storybook/addon-a11y": "^5.2.8",
-    "@storybook/addon-actions": "^5.2.6",
+    "@storybook/addon-actions": "^5.2.8",
     "@storybook/addon-notes": "^5.2.8",
     "@storybook/vue": "~5.2.6",
     "@vue/cli-shared-utils": "~4.1.1",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index c1018a203..286ee9ef3 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -2066,17 +2066,17 @@
     redux "^4.0.1"
     util-deprecate "^1.0.2"
 
-"@storybook/addon-actions@^5.2.6":
-  version "5.2.6"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-5.2.6.tgz#4fe411fc3bdb1d44058f23fbc8eb8d1bac29d521"
-  integrity sha512-CwTJPqe3NcEU7oqS5KoiCX9FXYmI2Dyp1Sh6r90JmXZ8B49ZXm6BDLX0gS3TooD6/AcdU8xdBcSvN0CkxQ5QGA==
+"@storybook/addon-actions@^5.2.8":
+  version "5.2.8"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-5.2.8.tgz#f63c6e1afb59e94ca1ebc776b7cad9b815e7419e"
+  integrity sha512-hadk+UaU6upOW0g447RfLRrnXRgE2rjRVk5sT8mVxBMj032NnwUd7ie/BZwy1yg5B8oFtpkgQYwqhPtoO2xBaQ==
   dependencies:
-    "@storybook/addons" "5.2.6"
-    "@storybook/api" "5.2.6"
-    "@storybook/client-api" "5.2.6"
-    "@storybook/components" "5.2.6"
-    "@storybook/core-events" "5.2.6"
-    "@storybook/theming" "5.2.6"
+    "@storybook/addons" "5.2.8"
+    "@storybook/api" "5.2.8"
+    "@storybook/client-api" "5.2.8"
+    "@storybook/components" "5.2.8"
+    "@storybook/core-events" "5.2.8"
+    "@storybook/theming" "5.2.8"
     core-js "^3.0.1"
     fast-deep-equal "^2.0.1"
     global "^4.3.2"
@@ -2223,6 +2223,17 @@
     global "^4.3.2"
     telejson "^3.0.2"
 
+"@storybook/channel-postmessage@5.2.8":
+  version "5.2.8"
+  resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-5.2.8.tgz#7a84869ce0fc270c3b5dcd7fa4ed798b6055816f"
+  integrity sha512-RS3iDW1kpfODN+kBq3youn+KtLqHslZ4m7mTlOL80BUHKb4YkrA1lVkzpy1kVMWBU523pyDVQUVXr+M8y3iVug==
+  dependencies:
+    "@storybook/channels" "5.2.8"
+    "@storybook/client-logger" "5.2.8"
+    core-js "^3.0.1"
+    global "^4.3.2"
+    telejson "^3.0.2"
+
 "@storybook/channels@5.1.9":
   version "5.1.9"
   resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-5.1.9.tgz#003cfca0b9f1ba6cf47ce68304aedd71bdb55e74"
@@ -2265,6 +2276,28 @@
     qs "^6.6.0"
     util-deprecate "^1.0.2"
 
+"@storybook/client-api@5.2.8":
+  version "5.2.8"
+  resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-5.2.8.tgz#1de791f7888442287f848e5f544eb883c5edc0da"
+  integrity sha512-OCKhZ+2sS3ot0ZV48nD79BWVzvvdMjUFYl0073ps5q+1+TLic1AlNmH0Sb5/9NrYXNV86v3VrM2jUbGsKe1qyw==
+  dependencies:
+    "@storybook/addons" "5.2.8"
+    "@storybook/channel-postmessage" "5.2.8"
+    "@storybook/channels" "5.2.8"
+    "@storybook/client-logger" "5.2.8"
+    "@storybook/core-events" "5.2.8"
+    "@storybook/router" "5.2.8"
+    common-tags "^1.8.0"
+    core-js "^3.0.1"
+    eventemitter3 "^4.0.0"
+    global "^4.3.2"
+    is-plain-object "^3.0.0"
+    lodash "^4.17.15"
+    memoizerific "^1.11.3"
+    qs "^6.6.0"
+    stable "^0.1.8"
+    util-deprecate "^1.0.2"
+
 "@storybook/client-logger@5.1.9":
   version "5.1.9"
   resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-5.1.9.tgz#87e2f7578416269adeccd407584010bc353f14d3"

From eee0253c2c0fad26ff2246c0129226bf4628045e Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 3 Dec 2019 08:41:37 +0000
Subject: [PATCH 152/174] build(deps-dev): bump @storybook/vue from 5.2.6 to
 5.2.8 in /webapp

Bumps [@storybook/vue](https://github.com/storybookjs/storybook/tree/HEAD/app/vue) from 5.2.6 to 5.2.8.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v5.2.8/app/vue)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 webapp/package.json |   2 +-
 webapp/yarn.lock    | 154 ++++++++++++++++++++++++++++----------------
 2 files changed, 101 insertions(+), 55 deletions(-)

diff --git a/webapp/package.json b/webapp/package.json
index aadde468c..d827531d8 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -103,7 +103,7 @@
     "@storybook/addon-a11y": "^5.2.8",
     "@storybook/addon-actions": "^5.2.6",
     "@storybook/addon-notes": "^5.2.8",
-    "@storybook/vue": "~5.2.6",
+    "@storybook/vue": "~5.2.8",
     "@vue/cli-shared-utils": "~4.1.1",
     "@vue/eslint-config-prettier": "~6.0.0",
     "@vue/server-test-utils": "~1.0.0-beta.30",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index c1018a203..25088fca3 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -106,13 +106,6 @@
     lodash "^4.17.13"
     source-map "^0.5.0"
 
-"@babel/helper-annotate-as-pure@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.0.0.tgz#323d39dd0b50e10c7c06ca7d7638e6864d8c5c32"
-  integrity sha512-3UYcJUj9kvSLbLbUIfQTqzcy5VX7GRZ/CCDrnOaZorFFM01aXp1+GJwuFGV4NDDoAS+mOUyHcO6UD/RfqOks3Q==
-  dependencies:
-    "@babel/types" "^7.0.0"
-
 "@babel/helper-annotate-as-pure@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.7.4.tgz#bb3faf1e74b74bd547e867e48f551fa6b098b6ce"
@@ -161,6 +154,18 @@
     "@babel/helper-replace-supers" "^7.5.5"
     "@babel/helper-split-export-declaration" "^7.4.4"
 
+"@babel/helper-create-class-features-plugin@^7.7.4":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.7.4.tgz#fce60939fd50618610942320a8d951b3b639da2d"
+  integrity sha512-l+OnKACG4uiDHQ/aJT8dwpR+LhCJALxL0mJ6nzjB25e5IPwqV1VOsY7ah6UB1DG+VOXAIMtuC54rFJGiHkxjgA==
+  dependencies:
+    "@babel/helper-function-name" "^7.7.4"
+    "@babel/helper-member-expression-to-functions" "^7.7.4"
+    "@babel/helper-optimise-call-expression" "^7.7.4"
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-replace-supers" "^7.7.4"
+    "@babel/helper-split-export-declaration" "^7.7.4"
+
 "@babel/helper-create-regexp-features-plugin@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.7.4.tgz#6d5762359fd34f4da1500e4cff9955b5299aaf59"
@@ -379,7 +384,7 @@
     "@babel/helper-remap-async-to-generator" "^7.7.4"
     "@babel/plugin-syntax-async-generators" "^7.7.4"
 
-"@babel/plugin-proposal-class-properties@^7.3.3", "@babel/plugin-proposal-class-properties@^7.5.5":
+"@babel/plugin-proposal-class-properties@^7.5.5":
   version "7.5.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.5.5.tgz#a974cfae1e37c3110e71f3c6a2e48b8e71958cd4"
   integrity sha512-AF79FsnWFxjlaosgdi421vmYG6/jg79bVD0dpD44QdgobzHKuLZ6S3vl8la9qIeSwGi8i1fS0O1mfuDAAdo1/A==
@@ -387,6 +392,14 @@
     "@babel/helper-create-class-features-plugin" "^7.5.5"
     "@babel/helper-plugin-utils" "^7.0.0"
 
+"@babel/plugin-proposal-class-properties@^7.7.0":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.7.4.tgz#2f964f0cb18b948450362742e33e15211e77c2ba"
+  integrity sha512-EcuXeV4Hv1X3+Q1TsuOmyyxeTRiSqurGJ26+I/FW1WbymmRRapVORm6x1Zl3iDIHyRxEs+VXWp6qnlcfcJSbbw==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.7.4"
+    "@babel/helper-plugin-utils" "^7.0.0"
+
 "@babel/plugin-proposal-decorators@^7.6.0":
   version "7.6.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.6.0.tgz#6659d2572a17d70abd68123e89a12a43d90aa30c"
@@ -412,7 +425,7 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-json-strings" "^7.7.4"
 
-"@babel/plugin-proposal-object-rest-spread@^7.3.2", "@babel/plugin-proposal-object-rest-spread@^7.7.4":
+"@babel/plugin-proposal-object-rest-spread@^7.6.2", "@babel/plugin-proposal-object-rest-spread@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.7.4.tgz#cc57849894a5c774214178c8ab64f6334ec8af71"
   integrity sha512-rnpnZR3/iWKmiQyJ3LKJpSwLDcX/nSXhdLk4Aq/tXOApIvyu7qoabrige0ylsAJffaUC51WiBu209Q0U+86OWQ==
@@ -677,12 +690,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-transform-react-constant-elements@^7.2.0":
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.5.0.tgz#4d6ae4033bc38f8a65dfca2b6235c44522a422fc"
-  integrity sha512-c5Ba8cpybZFp1Izkf2sWGuNjOxoQ32tFgBvvYvwGhi4+9f6vGiSK9Gex4uVuO/Va6YJFu41aAh1MzMjUWkp0IQ==
+"@babel/plugin-transform-react-constant-elements@^7.6.3":
+  version "7.7.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.7.4.tgz#499cf732a21ffd62cc4b0016e27c3906097f8982"
+  integrity sha512-U6XkHZ8RnmeEb8jBUOpeo6oFka5RhLgxAVvK4/fBbwoYlsHQYLb8I37ymTPDVsrWjqb94+hueuWQA/1OAA4rAQ==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.0.0"
+    "@babel/helper-annotate-as-pure" "^7.7.4"
     "@babel/helper-plugin-utils" "^7.0.0"
 
 "@babel/plugin-transform-regenerator@^7.7.4":
@@ -754,7 +767,7 @@
     "@babel/helper-create-regexp-features-plugin" "^7.7.4"
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/preset-env@^7.4.5", "@babel/preset-env@^7.6.3", "@babel/preset-env@~7.7.4":
+"@babel/preset-env@^7.6.3", "@babel/preset-env@^7.7.1", "@babel/preset-env@~7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.7.4.tgz#ccaf309ae8d1ee2409c85a4e2b5e280ceee830f8"
   integrity sha512-Dg+ciGJjwvC1NIe/DGblMbcGq1HOtKbw8RLl4nIjlfcILKEOkWT/vRqPpumswABEBVudii6dnVwrBtzD7ibm4g==
@@ -2223,6 +2236,17 @@
     global "^4.3.2"
     telejson "^3.0.2"
 
+"@storybook/channel-postmessage@5.2.8":
+  version "5.2.8"
+  resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-5.2.8.tgz#7a84869ce0fc270c3b5dcd7fa4ed798b6055816f"
+  integrity sha512-RS3iDW1kpfODN+kBq3youn+KtLqHslZ4m7mTlOL80BUHKb4YkrA1lVkzpy1kVMWBU523pyDVQUVXr+M8y3iVug==
+  dependencies:
+    "@storybook/channels" "5.2.8"
+    "@storybook/client-logger" "5.2.8"
+    core-js "^3.0.1"
+    global "^4.3.2"
+    telejson "^3.0.2"
+
 "@storybook/channels@5.1.9":
   version "5.1.9"
   resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-5.1.9.tgz#003cfca0b9f1ba6cf47ce68304aedd71bdb55e74"
@@ -2265,6 +2289,28 @@
     qs "^6.6.0"
     util-deprecate "^1.0.2"
 
+"@storybook/client-api@5.2.8":
+  version "5.2.8"
+  resolved "https://registry.yarnpkg.com/@storybook/client-api/-/client-api-5.2.8.tgz#1de791f7888442287f848e5f544eb883c5edc0da"
+  integrity sha512-OCKhZ+2sS3ot0ZV48nD79BWVzvvdMjUFYl0073ps5q+1+TLic1AlNmH0Sb5/9NrYXNV86v3VrM2jUbGsKe1qyw==
+  dependencies:
+    "@storybook/addons" "5.2.8"
+    "@storybook/channel-postmessage" "5.2.8"
+    "@storybook/channels" "5.2.8"
+    "@storybook/client-logger" "5.2.8"
+    "@storybook/core-events" "5.2.8"
+    "@storybook/router" "5.2.8"
+    common-tags "^1.8.0"
+    core-js "^3.0.1"
+    eventemitter3 "^4.0.0"
+    global "^4.3.2"
+    is-plain-object "^3.0.0"
+    lodash "^4.17.15"
+    memoizerific "^1.11.3"
+    qs "^6.6.0"
+    stable "^0.1.8"
+    util-deprecate "^1.0.2"
+
 "@storybook/client-logger@5.1.9":
   version "5.1.9"
   resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-5.1.9.tgz#87e2f7578416269adeccd407584010bc353f14d3"
@@ -2381,25 +2427,25 @@
   dependencies:
     core-js "^3.0.1"
 
-"@storybook/core@5.2.6":
-  version "5.2.6"
-  resolved "https://registry.yarnpkg.com/@storybook/core/-/core-5.2.6.tgz#60c092607158d7d28db59f7e67da4f7e12703fb2"
-  integrity sha512-q7Ful7TCm9nmjgLsJFqIwVv395NlaOXgGajyaQCQlCKB2V+jgs7GDmdCNNdWAOue4eAsFU6wQSP9lWtq0yzK4w==
+"@storybook/core@5.2.8":
+  version "5.2.8"
+  resolved "https://registry.yarnpkg.com/@storybook/core/-/core-5.2.8.tgz#3f6ddbacc705c1893deb15582c3a0a1ecd882cd1"
+  integrity sha512-P1Xx4setLBESPgS5KgL7Jskf5Q6fRa3ApwPt+ocjDoSDGCvsV7cUEpAp09U65u+89e5K4nQxvaZouhknFQBc1A==
   dependencies:
-    "@babel/plugin-proposal-class-properties" "^7.3.3"
-    "@babel/plugin-proposal-object-rest-spread" "^7.3.2"
+    "@babel/plugin-proposal-class-properties" "^7.7.0"
+    "@babel/plugin-proposal-object-rest-spread" "^7.6.2"
     "@babel/plugin-syntax-dynamic-import" "^7.2.0"
-    "@babel/plugin-transform-react-constant-elements" "^7.2.0"
-    "@babel/preset-env" "^7.4.5"
-    "@storybook/addons" "5.2.6"
-    "@storybook/channel-postmessage" "5.2.6"
-    "@storybook/client-api" "5.2.6"
-    "@storybook/client-logger" "5.2.6"
-    "@storybook/core-events" "5.2.6"
-    "@storybook/node-logger" "5.2.6"
-    "@storybook/router" "5.2.6"
-    "@storybook/theming" "5.2.6"
-    "@storybook/ui" "5.2.6"
+    "@babel/plugin-transform-react-constant-elements" "^7.6.3"
+    "@babel/preset-env" "^7.7.1"
+    "@storybook/addons" "5.2.8"
+    "@storybook/channel-postmessage" "5.2.8"
+    "@storybook/client-api" "5.2.8"
+    "@storybook/client-logger" "5.2.8"
+    "@storybook/core-events" "5.2.8"
+    "@storybook/node-logger" "5.2.8"
+    "@storybook/router" "5.2.8"
+    "@storybook/theming" "5.2.8"
+    "@storybook/ui" "5.2.8"
     airbnb-js-shims "^1 || ^2"
     ansi-to-html "^0.6.11"
     autoprefixer "^9.4.9"
@@ -2455,10 +2501,10 @@
     webpack-dev-middleware "^3.7.0"
     webpack-hot-middleware "^2.25.0"
 
-"@storybook/node-logger@5.2.6":
-  version "5.2.6"
-  resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-5.2.6.tgz#e353aff14375bef9e922c217a0afb50f93e2ceb1"
-  integrity sha512-Z3mn9CUSiG7kR2OBoz4lNeoeBS094h5d9wufZSp5S+M47L6KEXmTgNcuePKj+t8Z8KT/Ph8B63bjChseKp3DNw==
+"@storybook/node-logger@5.2.8":
+  version "5.2.8"
+  resolved "https://registry.yarnpkg.com/@storybook/node-logger/-/node-logger-5.2.8.tgz#4a3df21d731014d54b9ca53d5b9a72dd350bb075"
+  integrity sha512-3TK5mx6VWbfJO+WUrqwPhTbTQ4qESTnwJY/02xPzOhvuC6tIG1QOxzi+Rq6rFlwxTpUuWh6iyDYnGIqFFQywkA==
   dependencies:
     chalk "^2.4.2"
     core-js "^3.0.1"
@@ -2557,19 +2603,19 @@
     prop-types "^15.7.2"
     resolve-from "^5.0.0"
 
-"@storybook/ui@5.2.6":
-  version "5.2.6"
-  resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-5.2.6.tgz#33df2f2e03d9cf81dc52928a0dc4db280ee8f56a"
-  integrity sha512-jT3PtpEsTqnESO0U8BotC+5P971Xqy0s2leSZcgU9PNe4Eb7NaxypSULOulPgPAx1JOmMipUBdK54PP/nyudkA==
+"@storybook/ui@5.2.8":
+  version "5.2.8"
+  resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-5.2.8.tgz#da8afca9eb29a40ef3ddc6a9f6e76d7a3344f2ef"
+  integrity sha512-7t1ARBfylhEsLmGsZBUCj1Wf1oAgCDDrf7fi+Fhdg5Rr16CMoBbe24Gv/mPYv01/pUDhGodxzltKGX5x0Hto2w==
   dependencies:
-    "@storybook/addons" "5.2.6"
-    "@storybook/api" "5.2.6"
-    "@storybook/channels" "5.2.6"
-    "@storybook/client-logger" "5.2.6"
-    "@storybook/components" "5.2.6"
-    "@storybook/core-events" "5.2.6"
-    "@storybook/router" "5.2.6"
-    "@storybook/theming" "5.2.6"
+    "@storybook/addons" "5.2.8"
+    "@storybook/api" "5.2.8"
+    "@storybook/channels" "5.2.8"
+    "@storybook/client-logger" "5.2.8"
+    "@storybook/components" "5.2.8"
+    "@storybook/core-events" "5.2.8"
+    "@storybook/router" "5.2.8"
+    "@storybook/theming" "5.2.8"
     copy-to-clipboard "^3.0.8"
     core-js "^3.0.1"
     core-js-pure "^3.0.1"
@@ -2596,13 +2642,13 @@
     telejson "^3.0.2"
     util-deprecate "^1.0.2"
 
-"@storybook/vue@~5.2.6":
-  version "5.2.6"
-  resolved "https://registry.yarnpkg.com/@storybook/vue/-/vue-5.2.6.tgz#1d79880c7e1a14e4deb66c5e438ed3326a3c7c47"
-  integrity sha512-jYoe+rHT1mKCJp8tcbE6ZPIhLidi5nD9z4XKzfHCZ4HsIWSl7dD+Q7QX1JeZYCCMf6VA27G40l4hUJHWEUyWxA==
+"@storybook/vue@~5.2.8":
+  version "5.2.8"
+  resolved "https://registry.yarnpkg.com/@storybook/vue/-/vue-5.2.8.tgz#1e80a855e9d5258945d17399decaa5a0cfb75b61"
+  integrity sha512-d/Xzu5sNEvWHKml3Lorpue0s3yd7JdrHySsAia4QBwPum0/GiVbTRUnWtJC9Gi/iWXBkqfB/sejs8NIh/QHHZA==
   dependencies:
-    "@storybook/addons" "5.2.6"
-    "@storybook/core" "5.2.6"
+    "@storybook/addons" "5.2.8"
+    "@storybook/core" "5.2.8"
     "@types/webpack-env" "^1.13.9"
     common-tags "^1.8.0"
     core-js "^3.0.1"

From 21a3ff4bc85496de18cb1328c455f06fc857bac1 Mon Sep 17 00:00:00 2001
From: Alina Beck <alina.beck@mail.com>
Date: Tue, 3 Dec 2019 12:03:41 +0300
Subject: [PATCH 153/174] render just one thead and tbody for the reports table

---
 .../_new/features/ReportList/ReportList.vue   |   4 +-
 .../features/ReportsTable/ReportsTable.vue    | 269 +++++++++---------
 2 files changed, 135 insertions(+), 138 deletions(-)

diff --git a/webapp/components/_new/features/ReportList/ReportList.vue b/webapp/components/_new/features/ReportList/ReportList.vue
index 65c8fdc95..b29362da5 100644
--- a/webapp/components/_new/features/ReportList/ReportList.vue
+++ b/webapp/components/_new/features/ReportList/ReportList.vue
@@ -1,6 +1,6 @@
 <template>
   <ds-card>
-    <div class="report-list-header">
+    <div class="reports-header">
       <h3 class="title">{{ $t('moderation.reports.name') }}</h3>
       <client-only>
         <dropdown-filter @filter="filter" :filterOptions="filterOptions" :selected="selected" />
@@ -132,7 +132,7 @@ export default {
 </script>
 
 <style lang="scss">
-.report-list-header {
+.reports-header {
   display: flex;
   justify-content: space-between;
   margin: $space-small 0;
diff --git a/webapp/components/_new/features/ReportsTable/ReportsTable.vue b/webapp/components/_new/features/ReportsTable/ReportsTable.vue
index 29637aefb..04fd877c5 100644
--- a/webapp/components/_new/features/ReportsTable/ReportsTable.vue
+++ b/webapp/components/_new/features/ReportsTable/ReportsTable.vue
@@ -1,7 +1,7 @@
 <template>
   <table
     v-if="reports && reports.length"
-    class="ds-table ds-table-condensed"
+    class="ds-table ds-table-condensed ds-table-bordered"
     cellspacing="0"
     cellpadding="0"
   >
@@ -12,152 +12,149 @@
       <col width="20%" />
       <col width="20%" />
     </colgroup>
+    <thead class="ds-table-col ds-table-head-col">
+      <tr valign="top">
+        <th></th>
+        <th>
+          {{ $t('moderation.reports.contentRowHeadline') }}
+        </th>
+        <th>
+          {{ $t('moderation.reports.authorRowHeadline') }}
+        </th>
+        <th>
+          {{ $t('moderation.reports.typeRowHeadline') }}
+        </th>
+        <th>
+          {{ $t('moderation.reports.decisionRowHeadline') }}
+        </th>
+      </tr>
+    </thead>
+    <tbody>
     <template v-for="report in reports">
-      <thead
-        :class="[report.closed ? 'decision' : 'no-decision', 'ds-table-col', 'ds-table-head-col']"
-        :key="'thead-' + report.resource.id"
-      >
-        <tr valign="top">
-          <th></th>
-          <th>
-            {{ $t('moderation.reports.contentRowHeadline') }}
-          </th>
-          <th>
-            {{ $t('moderation.reports.authorRowHeadline') }}
-          </th>
-          <th>
-            {{ $t('moderation.reports.typeRowHeadline') }}
-          </th>
-          <th>
-            {{ $t('moderation.reports.decisionRowHeadline') }}
-          </th>
-        </tr>
-      </thead>
-      <tbody :key="'tbody-' + report.resource.id">
-        <tr valign="top" :data-test="report.resource.__typename">
-          <td class="ds-table-col">
-            <ds-text color="soft">
-              <base-icon
-                v-if="isPost(report.resource)"
-                v-tooltip="{ report: $t('report.contribution.type'), placement: 'right' }"
-                name="bookmark"
-              />
-              <base-icon
-                v-else-if="isComment(report.resource)"
-                v-tooltip="{ report: $t('report.comment.type'), placement: 'right' }"
-                name="comments"
-              />
-              <base-icon
-                v-else-if="isUser(report.resource)"
-                v-tooltip="{ report: $t('report.user.type'), placement: 'right' }"
-                name="user"
-              />
-            </ds-text>
-          </td>
-          <td class="ds-table-col ">
-            <div v-if="isPost(report.resource) || isComment(report.resource)">
-              <nuxt-link
-                data-test="post-link"
-                :to="{
-                  name: 'post-id-slug',
-                  params: params(report.resource),
-                  hash: hashParam(report.resource),
-                }"
-              >
-                <b>
-                  {{
-                    report.resource.title ||
-                      $filters.removeHtml(report.resource.contentExcerpt) | truncate(50)
-                  }}
-                </b>
-              </nuxt-link>
-            </div>
-            <div v-else>
-              <client-only>
-                <hc-user
-                  :user="report.resource"
-                  :showAvatar="false"
-                  :trunc="30"
-                  :data-test="report.resource.slug"
-                />
-              </client-only>
-            </div>
-          </td>
-          <td class="ds-table-col ">
+      <tr :key="report.resource.id" valign="top" :data-test="report.resource.__typename">
+        <td class="ds-table-col">
+          <ds-text color="soft">
+            <base-icon
+              v-if="isPost(report.resource)"
+              v-tooltip="{ report: $t('report.contribution.type'), placement: 'right' }"
+              name="bookmark"
+            />
+            <base-icon
+              v-else-if="isComment(report.resource)"
+              v-tooltip="{ report: $t('report.comment.type'), placement: 'right' }"
+              name="comments"
+            />
+            <base-icon
+              v-else-if="isUser(report.resource)"
+              v-tooltip="{ report: $t('report.user.type'), placement: 'right' }"
+              name="user"
+            />
+          </ds-text>
+        </td>
+        <td class="ds-table-col ">
+          <div v-if="isPost(report.resource) || isComment(report.resource)">
+            <nuxt-link
+              data-test="post-link"
+              :to="{
+                name: 'post-id-slug',
+                params: params(report.resource),
+                hash: hashParam(report.resource),
+              }"
+            >
+              <b>
+                {{
+                  report.resource.title ||
+                    $filters.removeHtml(report.resource.contentExcerpt) | truncate(50)
+                }}
+              </b>
+            </nuxt-link>
+          </div>
+          <div v-else>
             <client-only>
               <hc-user
-                v-if="report.resource.__typename !== 'User'"
-                :user="report.resource.author"
+                :user="report.resource"
                 :showAvatar="false"
                 :trunc="30"
-                :data-test="report.resource.author.slug"
+                :data-test="report.resource.slug"
               />
-              <span v-else>—</span>
             </client-only>
-          </td>
-          <td>
-            <div v-if="report.reviewed">
-              <br />
-              <div v-if="report.resource.disabled" data-test="disabled">
-                <base-icon name="eye-slash" class="ban" />
-                {{ $t('moderation.reports.disabledBy') }}
-              </div>
-              <div v-else data-test="enabled">
-                <base-icon name="eye" class="no-ban" />
-                {{ $t('moderation.reports.enabledBy') }}
-              </div>
-              <client-only>
-                <hc-user
-                  :user="moderatorOfLatestReview(report)"
-                  :showAvatar="false"
-                  :trunc="30"
-                  :date-time="report.updatedAt"
-                  positionDatetime="below"
-                  :data-test="moderatorOfLatestReview(report).slug"
-                />
-              </client-only>
+          </div>
+        </td>
+        <td class="ds-table-col ">
+          <client-only>
+            <hc-user
+              v-if="report.resource.__typename !== 'User'"
+              :user="report.resource.author"
+              :showAvatar="false"
+              :trunc="30"
+              :data-test="report.resource.author.slug"
+            />
+            <span v-else>—</span>
+          </client-only>
+        </td>
+        <td>
+          <div v-if="report.reviewed">
+            <br />
+            <div v-if="report.resource.disabled" data-test="disabled">
+              <base-icon name="eye-slash" class="ban" />
+              {{ $t('moderation.reports.disabledBy') }}
             </div>
-            <div v-else>
-              <br />
-              <div data-test="unreviewed">
-                <base-icon name="eye" class="no-ban" />
-                {{ $t('moderation.reports.enabled') }}
-              </div>
+            <div v-else data-test="enabled">
+              <base-icon name="eye" class="no-ban" />
+              {{ $t('moderation.reports.enabledBy') }}
             </div>
-          </td>
-          <td class="ds-table-col">
-            <b v-if="report.closed" data-test="closed">
-              {{ $t('moderation.reports.decided') }}
-            </b>
-            <ds-button
-              v-else
-              danger
-              class="confirm"
-              :icon="report.resource.disabled ? 'eye-slash' : 'eye'"
-              @click="confirm(report)"
-            >
-              {{ $t('moderation.reports.decideButton') }}
+            <client-only>
+              <hc-user
+                :user="moderatorOfLatestReview(report)"
+                :showAvatar="false"
+                :trunc="30"
+                :date-time="report.updatedAt"
+                positionDatetime="below"
+                :data-test="moderatorOfLatestReview(report).slug"
+              />
+            </client-only>
+          </div>
+          <div v-else>
+            <br />
+            <div data-test="unreviewed">
+              <base-icon name="eye" class="no-ban" />
+              {{ $t('moderation.reports.enabled') }}
+            </div>
+          </div>
+        </td>
+        <td class="ds-table-col">
+          <b v-if="report.closed" data-test="closed">
+            {{ $t('moderation.reports.decided') }}
+          </b>
+          <ds-button
+            v-else
+            danger
+            class="confirm"
+            :icon="report.resource.disabled ? 'eye-slash' : 'eye'"
+            @click="confirm(report)"
+          >
+            {{ $t('moderation.reports.decideButton') }}
+          </ds-button>
+        </td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>
+          <counter-icon icon="flag" :count="report.filed.length">
+            <ds-button ghost primary @click="showFiledReports = !showFiledReports">
+              {{ $t('moderation.reports.moreDetails') }}
             </ds-button>
-          </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>
-            <counter-icon icon="flag" :count="report.filed.length">
-              <ds-button ghost primary @click="showFiledReports = !showFiledReports">
-                {{ $t('moderation.reports.moreDetails') }}
-              </ds-button>
-            </counter-icon>
-          </td>
-        </tr>
-        <tr>
-          <td class="ds-table-col filed-table" colspan="4">
-            <ds-space margin-bottom="base" />
-            <filed-table :filed="report.filed" v-if="showFiledReports" />
-          </td>
-        </tr>
-      </tbody>
+          </counter-icon>
+        </td>
+      </tr>
+      <tr>
+        <td class="ds-table-col filed-table" colspan="4">
+          <ds-space margin-bottom="base" />
+          <filed-table :filed="report.filed" v-if="showFiledReports" />
+        </td>
+      </tr>
     </template>
+    </tbody>
   </table>
   <hc-empty v-else icon="alert" :message="$t('moderation.reports.empty')" />
 </template>

From febabf9303da13c77bdc31a68c1af8823894b6b8 Mon Sep 17 00:00:00 2001
From: Alina Beck <alina.beck@mail.com>
Date: Tue, 3 Dec 2019 12:25:19 +0300
Subject: [PATCH 154/174] rename table header translations

---
 .../features/ReportsTable/ReportsTable.vue    | 260 +++++++++---------
 webapp/locales/de.json                        |   8 +-
 webapp/locales/en.json                        |   8 +-
 3 files changed, 134 insertions(+), 142 deletions(-)

diff --git a/webapp/components/_new/features/ReportsTable/ReportsTable.vue b/webapp/components/_new/features/ReportsTable/ReportsTable.vue
index 04fd877c5..27dcf43a5 100644
--- a/webapp/components/_new/features/ReportsTable/ReportsTable.vue
+++ b/webapp/components/_new/features/ReportsTable/ReportsTable.vue
@@ -15,145 +15,137 @@
     <thead class="ds-table-col ds-table-head-col">
       <tr valign="top">
         <th></th>
-        <th>
-          {{ $t('moderation.reports.contentRowHeadline') }}
-        </th>
-        <th>
-          {{ $t('moderation.reports.authorRowHeadline') }}
-        </th>
-        <th>
-          {{ $t('moderation.reports.typeRowHeadline') }}
-        </th>
-        <th>
-          {{ $t('moderation.reports.decisionRowHeadline') }}
-        </th>
+        <th>{{ $t('moderation.reports.content') }}</th>
+        <th>{{ $t('moderation.reports.author') }}</th>
+        <th>{{ $t('moderation.reports.status') }}</th>
+        <th>{{ $t('moderation.reports.decision') }}</th>
       </tr>
     </thead>
     <tbody>
-    <template v-for="report in reports">
-      <tr :key="report.resource.id" valign="top" :data-test="report.resource.__typename">
-        <td class="ds-table-col">
-          <ds-text color="soft">
-            <base-icon
-              v-if="isPost(report.resource)"
-              v-tooltip="{ report: $t('report.contribution.type'), placement: 'right' }"
-              name="bookmark"
-            />
-            <base-icon
-              v-else-if="isComment(report.resource)"
-              v-tooltip="{ report: $t('report.comment.type'), placement: 'right' }"
-              name="comments"
-            />
-            <base-icon
-              v-else-if="isUser(report.resource)"
-              v-tooltip="{ report: $t('report.user.type'), placement: 'right' }"
-              name="user"
-            />
-          </ds-text>
-        </td>
-        <td class="ds-table-col ">
-          <div v-if="isPost(report.resource) || isComment(report.resource)">
-            <nuxt-link
-              data-test="post-link"
-              :to="{
-                name: 'post-id-slug',
-                params: params(report.resource),
-                hash: hashParam(report.resource),
-              }"
+      <template v-for="report in reports">
+        <tr :key="'1-' + report.resource.id" valign="top" :data-test="report.resource.__typename">
+          <td class="ds-table-col">
+            <ds-text color="soft">
+              <base-icon
+                v-if="isPost(report.resource)"
+                v-tooltip="{ report: $t('report.contribution.type'), placement: 'right' }"
+                name="bookmark"
+              />
+              <base-icon
+                v-else-if="isComment(report.resource)"
+                v-tooltip="{ report: $t('report.comment.type'), placement: 'right' }"
+                name="comments"
+              />
+              <base-icon
+                v-else-if="isUser(report.resource)"
+                v-tooltip="{ report: $t('report.user.type'), placement: 'right' }"
+                name="user"
+              />
+            </ds-text>
+          </td>
+          <td class="ds-table-col ">
+            <div v-if="isPost(report.resource) || isComment(report.resource)">
+              <nuxt-link
+                data-test="post-link"
+                :to="{
+                  name: 'post-id-slug',
+                  params: params(report.resource),
+                  hash: hashParam(report.resource),
+                }"
+              >
+                <b>
+                  {{
+                    report.resource.title ||
+                      $filters.removeHtml(report.resource.contentExcerpt) | truncate(50)
+                  }}
+                </b>
+              </nuxt-link>
+            </div>
+            <div v-else>
+              <client-only>
+                <hc-user
+                  :user="report.resource"
+                  :showAvatar="false"
+                  :trunc="30"
+                  :data-test="report.resource.slug"
+                />
+              </client-only>
+            </div>
+          </td>
+          <td class="ds-table-col ">
+            <client-only>
+              <hc-user
+                v-if="report.resource.__typename !== 'User'"
+                :user="report.resource.author"
+                :showAvatar="false"
+                :trunc="30"
+                :data-test="report.resource.author.slug"
+              />
+              <span v-else>—</span>
+            </client-only>
+          </td>
+          <td>
+            <div v-if="report.reviewed">
+              <br />
+              <div v-if="report.resource.disabled" data-test="disabled">
+                <base-icon name="eye-slash" class="ban" />
+                {{ $t('moderation.reports.disabledBy') }}
+              </div>
+              <div v-else data-test="enabled">
+                <base-icon name="eye" class="no-ban" />
+                {{ $t('moderation.reports.enabledBy') }}
+              </div>
+              <client-only>
+                <hc-user
+                  :user="moderatorOfLatestReview(report)"
+                  :showAvatar="false"
+                  :trunc="30"
+                  :date-time="report.updatedAt"
+                  positionDatetime="below"
+                  :data-test="moderatorOfLatestReview(report).slug"
+                />
+              </client-only>
+            </div>
+            <div v-else>
+              <br />
+              <div data-test="unreviewed">
+                <base-icon name="eye" class="no-ban" />
+                {{ $t('moderation.reports.enabled') }}
+              </div>
+            </div>
+          </td>
+          <td class="ds-table-col">
+            <b v-if="report.closed" data-test="closed">
+              {{ $t('moderation.reports.decided') }}
+            </b>
+            <ds-button
+              v-else
+              danger
+              class="confirm"
+              :icon="report.resource.disabled ? 'eye-slash' : 'eye'"
+              @click="confirm(report)"
             >
-              <b>
-                {{
-                  report.resource.title ||
-                    $filters.removeHtml(report.resource.contentExcerpt) | truncate(50)
-                }}
-              </b>
-            </nuxt-link>
-          </div>
-          <div v-else>
-            <client-only>
-              <hc-user
-                :user="report.resource"
-                :showAvatar="false"
-                :trunc="30"
-                :data-test="report.resource.slug"
-              />
-            </client-only>
-          </div>
-        </td>
-        <td class="ds-table-col ">
-          <client-only>
-            <hc-user
-              v-if="report.resource.__typename !== 'User'"
-              :user="report.resource.author"
-              :showAvatar="false"
-              :trunc="30"
-              :data-test="report.resource.author.slug"
-            />
-            <span v-else>—</span>
-          </client-only>
-        </td>
-        <td>
-          <div v-if="report.reviewed">
-            <br />
-            <div v-if="report.resource.disabled" data-test="disabled">
-              <base-icon name="eye-slash" class="ban" />
-              {{ $t('moderation.reports.disabledBy') }}
-            </div>
-            <div v-else data-test="enabled">
-              <base-icon name="eye" class="no-ban" />
-              {{ $t('moderation.reports.enabledBy') }}
-            </div>
-            <client-only>
-              <hc-user
-                :user="moderatorOfLatestReview(report)"
-                :showAvatar="false"
-                :trunc="30"
-                :date-time="report.updatedAt"
-                positionDatetime="below"
-                :data-test="moderatorOfLatestReview(report).slug"
-              />
-            </client-only>
-          </div>
-          <div v-else>
-            <br />
-            <div data-test="unreviewed">
-              <base-icon name="eye" class="no-ban" />
-              {{ $t('moderation.reports.enabled') }}
-            </div>
-          </div>
-        </td>
-        <td class="ds-table-col">
-          <b v-if="report.closed" data-test="closed">
-            {{ $t('moderation.reports.decided') }}
-          </b>
-          <ds-button
-            v-else
-            danger
-            class="confirm"
-            :icon="report.resource.disabled ? 'eye-slash' : 'eye'"
-            @click="confirm(report)"
-          >
-            {{ $t('moderation.reports.decideButton') }}
-          </ds-button>
-        </td>
-      </tr>
-      <tr>
-        <td></td>
-        <td>
-          <counter-icon icon="flag" :count="report.filed.length">
-            <ds-button ghost primary @click="showFiledReports = !showFiledReports">
-              {{ $t('moderation.reports.moreDetails') }}
+              {{ $t('moderation.reports.decideButton') }}
             </ds-button>
-          </counter-icon>
-        </td>
-      </tr>
-      <tr>
-        <td class="ds-table-col filed-table" colspan="4">
-          <ds-space margin-bottom="base" />
-          <filed-table :filed="report.filed" v-if="showFiledReports" />
-        </td>
-      </tr>
-    </template>
+          </td>
+        </tr>
+        <tr :key="'2-' + report.resource.id">
+          <td></td>
+          <td>
+            <counter-icon icon="flag" :count="report.filed.length">
+              <ds-button ghost primary @click="showFiledReports = !showFiledReports">
+                {{ $t('moderation.reports.moreDetails') }}
+              </ds-button>
+            </counter-icon>
+          </td>
+        </tr>
+        <tr :key="'3-' + report.resource.id">
+          <td class="ds-table-col filed-table" colspan="4">
+            <ds-space margin-bottom="base" />
+            <filed-table :filed="report.filed" v-if="showFiledReports" />
+          </td>
+        </tr>
+      </template>
     </tbody>
   </table>
   <hc-empty v-else icon="alert" :message="$t('moderation.reports.empty')" />
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index d92bbe0f9..0e754d760 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -316,10 +316,10 @@
         "reports": {
             "empty": "Glückwunsch, es gibt nichts zu moderieren.",
             "name": "Meldungen",
-            "typeRowHeadline": "Aktueller Status",
-            "contentRowHeadline": "Inhalt",
-            "authorRowHeadline": "Autor",
-            "decisionRowHeadline": "Entscheidung",
+            "status": "Aktueller Status",
+            "content": "Inhalt",
+            "author": "Autor",
+            "decision": "Entscheidung",
             "enabled": "Entsperrt",
             "disabled": "Gesperrt",
             "decided": "Entschieden",
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 0fe2b8eca..dc73a2d82 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -482,10 +482,10 @@
     "reports": {
       "empty": "Congratulations, nothing to moderate.",
       "name": "Reports",
-      "typeRowHeadline": "Current status",
-      "contentRowHeadline": "Content",
-      "authorRowHeadline": "Author",
-      "decisionRowHeadline": "Decision",
+      "status": "Current status",
+      "content": "Content",
+      "author": "Author",
+      "decision": "Decision",
       "enabled": "Enabled",
       "disabled": "Disabled",
       "decided": "Decided",

From 4585dc7e8c31ad617ffd911b2011e0d127c1223d Mon Sep 17 00:00:00 2001
From: Alina Beck <alina.beck@mail.com>
Date: Tue, 3 Dec 2019 12:45:28 +0300
Subject: [PATCH 155/174] table cell content design tweaks

---
 .../features/ReportsTable/ReportsTable.vue    | 40 +++++++++++--------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/webapp/components/_new/features/ReportsTable/ReportsTable.vue b/webapp/components/_new/features/ReportsTable/ReportsTable.vue
index 27dcf43a5..12a5e0f3d 100644
--- a/webapp/components/_new/features/ReportsTable/ReportsTable.vue
+++ b/webapp/components/_new/features/ReportsTable/ReportsTable.vue
@@ -7,18 +7,18 @@
   >
     <colgroup>
       <col width="5%" />
-      <col width="35%" />
-      <col width="20%" />
+      <col width="45%" />
       <col width="20%" />
       <col width="20%" />
+      <col width="10%" />
     </colgroup>
     <thead class="ds-table-col ds-table-head-col">
       <tr valign="top">
-        <th></th>
-        <th>{{ $t('moderation.reports.content') }}</th>
-        <th>{{ $t('moderation.reports.author') }}</th>
-        <th>{{ $t('moderation.reports.status') }}</th>
-        <th>{{ $t('moderation.reports.decision') }}</th>
+        <th class="ds-table-head-col"></th>
+        <th class="ds-table-head-col">{{ $t('moderation.reports.content') }}</th>
+        <th class="ds-table-head-col">{{ $t('moderation.reports.author') }}</th>
+        <th class="ds-table-head-col">{{ $t('moderation.reports.status') }}</th>
+        <th class="ds-table-head-col">{{ $t('moderation.reports.decision') }}</th>
       </tr>
     </thead>
     <tbody>
@@ -72,7 +72,7 @@
               </client-only>
             </div>
           </td>
-          <td class="ds-table-col ">
+          <td class="ds-table-col">
             <client-only>
               <hc-user
                 v-if="report.resource.__typename !== 'User'"
@@ -84,17 +84,16 @@
               <span v-else>—</span>
             </client-only>
           </td>
-          <td>
-            <div v-if="report.reviewed">
-              <br />
-              <div v-if="report.resource.disabled" data-test="disabled">
+          <td class="ds-table-col">
+            <template v-if="report.reviewed">
+              <span v-if="report.resource.disabled" data-test="disabled" class="status-line">
                 <base-icon name="eye-slash" class="ban" />
                 {{ $t('moderation.reports.disabledBy') }}
-              </div>
-              <div v-else data-test="enabled">
+              </span>
+              <span v-else data-test="enabled" class="status-line">
                 <base-icon name="eye" class="no-ban" />
                 {{ $t('moderation.reports.enabledBy') }}
-              </div>
+              </span>
               <client-only>
                 <hc-user
                   :user="moderatorOfLatestReview(report)"
@@ -105,9 +104,8 @@
                   :data-test="moderatorOfLatestReview(report).slug"
                 />
               </client-only>
-            </div>
+            </template>
             <div v-else>
-              <br />
               <div data-test="unreviewed">
                 <base-icon name="eye" class="no-ban" />
                 {{ $t('moderation.reports.enabled') }}
@@ -122,6 +120,7 @@
               v-else
               danger
               class="confirm"
+              size="small"
               :icon="report.resource.disabled ? 'eye-slash' : 'eye'"
               @click="confirm(report)"
             >
@@ -202,6 +201,13 @@ export default {
 }
 </script>
 <style lang="scss">
+.status-line {
+  display: inline-flex;
+
+  > .base-icon {
+    margin-right: $space-xx-small;
+  }
+}
 .filed-table {
   padding-left: $space-xx-large;
 }

From 980136934387336d410963daecb2a3e4847ad195 Mon Sep 17 00:00:00 2001
From: Alina Beck <alina.beck@mail.com>
Date: Tue, 3 Dec 2019 13:07:24 +0300
Subject: [PATCH 156/174] merge table rows

---
 .../features/ReportsTable/ReportsTable.vue    | 51 ++++++++++++-------
 1 file changed, 34 insertions(+), 17 deletions(-)

diff --git a/webapp/components/_new/features/ReportsTable/ReportsTable.vue b/webapp/components/_new/features/ReportsTable/ReportsTable.vue
index 12a5e0f3d..d6cb3dfe4 100644
--- a/webapp/components/_new/features/ReportsTable/ReportsTable.vue
+++ b/webapp/components/_new/features/ReportsTable/ReportsTable.vue
@@ -1,16 +1,16 @@
 <template>
   <table
     v-if="reports && reports.length"
-    class="ds-table ds-table-condensed ds-table-bordered"
+    class="ds-table ds-table-condensed ds-table-bordered reports-table"
     cellspacing="0"
     cellpadding="0"
   >
     <colgroup>
       <col width="5%" />
-      <col width="45%" />
+      <col width="40%" />
       <col width="20%" />
       <col width="20%" />
-      <col width="10%" />
+      <col width="15%" />
     </colgroup>
     <thead class="ds-table-col ds-table-head-col">
       <tr valign="top">
@@ -23,7 +23,7 @@
     </thead>
     <tbody>
       <template v-for="report in reports">
-        <tr :key="'1-' + report.resource.id" valign="top" :data-test="report.resource.__typename">
+        <tr :key="report.resource.id" valign="top" class="row" :data-test="report.resource.__typename">
           <td class="ds-table-col">
             <ds-text color="soft">
               <base-icon
@@ -71,6 +71,13 @@
                 />
               </client-only>
             </div>
+            <div class="nested-table-toggle">
+              <counter-icon icon="flag" :count="report.filed.length">
+                <ds-button ghost primary @click="showFiledReports = !showFiledReports">
+                  {{ $t('moderation.reports.moreDetails') }}
+                </ds-button>
+              </counter-icon>
+            </div>
           </td>
           <td class="ds-table-col">
             <client-only>
@@ -128,19 +135,8 @@
             </ds-button>
           </td>
         </tr>
-        <tr :key="'2-' + report.resource.id">
-          <td></td>
-          <td>
-            <counter-icon icon="flag" :count="report.filed.length">
-              <ds-button ghost primary @click="showFiledReports = !showFiledReports">
-                {{ $t('moderation.reports.moreDetails') }}
-              </ds-button>
-            </counter-icon>
-          </td>
-        </tr>
-        <tr :key="'3-' + report.resource.id">
-          <td class="ds-table-col filed-table" colspan="4">
-            <ds-space margin-bottom="base" />
+        <tr :key="'nested-table-' + report.resource.id" class="row">
+          <td colspan="100%">
             <filed-table :filed="report.filed" v-if="showFiledReports" />
           </td>
         </tr>
@@ -201,6 +197,20 @@ export default {
 }
 </script>
 <style lang="scss">
+.reports-table {
+  .row {
+    position: relative;
+  }
+
+  .row:nth-child(4n+1) {
+    background-color: $color-neutral-95;
+  }
+
+  .row:nth-child(4n+2) {
+    background-color: $color-neutral-95;
+  }
+}
+
 .status-line {
   display: inline-flex;
 
@@ -208,6 +218,13 @@ export default {
     margin-right: $space-xx-small;
   }
 }
+
+.nested-table-toggle {
+  position: absolute;
+  left: 0;
+  bottom: 0;
+}
+
 .filed-table {
   padding-left: $space-xx-large;
 }

From d685ff9e7b49be368bc3f7c28ae032871af25b76 Mon Sep 17 00:00:00 2001
From: Alina Beck <alina.beck@mail.com>
Date: Tue, 3 Dec 2019 13:25:20 +0300
Subject: [PATCH 157/174] translate and style user count

---
 .../features/ReportsTable/ReportsTable.vue    | 32 ++++++++++++-------
 webapp/locales/de.json                        |  9 ++++++
 webapp/locales/en.json                        |  3 +-
 3 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/webapp/components/_new/features/ReportsTable/ReportsTable.vue b/webapp/components/_new/features/ReportsTable/ReportsTable.vue
index d6cb3dfe4..666339685 100644
--- a/webapp/components/_new/features/ReportsTable/ReportsTable.vue
+++ b/webapp/components/_new/features/ReportsTable/ReportsTable.vue
@@ -6,15 +6,17 @@
     cellpadding="0"
   >
     <colgroup>
-      <col width="5%" />
+      <col width="4%" />
+      <col width="12%" />
       <col width="40%" />
-      <col width="20%" />
-      <col width="20%" />
-      <col width="15%" />
+      <col width="16%" />
+      <col width="16%" />
+      <col width="12%" />
     </colgroup>
     <thead class="ds-table-col ds-table-head-col">
       <tr valign="top">
         <th class="ds-table-head-col"></th>
+        <th class="ds-table-head-col">{{ $t('moderation.reports.submitter') }}</th>
         <th class="ds-table-head-col">{{ $t('moderation.reports.content') }}</th>
         <th class="ds-table-head-col">{{ $t('moderation.reports.author') }}</th>
         <th class="ds-table-head-col">{{ $t('moderation.reports.status') }}</th>
@@ -43,7 +45,15 @@
               />
             </ds-text>
           </td>
-          <td class="ds-table-col ">
+          <td class="ds-table-col">
+            <span class="user-count">
+              {{ $t('moderation.reports.numberOfUsers', { count: report.filed.length }) }}
+            </span>
+            <ds-button size="small" @click="showFiledReports = !showFiledReports">
+              {{ $t('moderation.reports.moreDetails') }}
+            </ds-button>
+          </td>
+          <td class="ds-table-col">
             <div v-if="isPost(report.resource) || isComment(report.resource)">
               <nuxt-link
                 data-test="post-link"
@@ -71,13 +81,6 @@
                 />
               </client-only>
             </div>
-            <div class="nested-table-toggle">
-              <counter-icon icon="flag" :count="report.filed.length">
-                <ds-button ghost primary @click="showFiledReports = !showFiledReports">
-                  {{ $t('moderation.reports.moreDetails') }}
-                </ds-button>
-              </counter-icon>
-            </div>
           </td>
           <td class="ds-table-col">
             <client-only>
@@ -219,6 +222,11 @@ export default {
   }
 }
 
+.user-count {
+  display: block;
+  margin-bottom: $space-xx-small;
+}
+
 .nested-table-toggle {
   position: absolute;
   left: 0;
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 0e754d760..a5fa917f1 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -334,6 +334,15 @@
             "reasonCategory": "Kategorie",
             "reasonDescription": "Beschreibung",
             "submitter": "Gemeldet von",
+            "numberOfUsers": "{count} Nutzern",
+            "filterLabel": {
+              "all": "Alle",
+              "unreviewed": "Nicht bearbeitet",
+              "reviewed": "Bearbeitet",
+              "closed": "Abgeschlossen"
+            },
+            "reportedOn": "Datum",
+            "moreDetails": "Details öffnen",
             "decideModal": {
               "submit": "Bestätige Entscheidung",
               "cancel": "Abbruch",
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index dc73a2d82..ebb7a6efd 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -500,6 +500,7 @@
       "reasonCategory": "Category",
       "reasonDescription": "Description",
       "submitter": "Reported by",
+      "numberOfUsers": "{count} users",
       "filterLabel": {
         "all": "All",
         "unreviewed": "Unreviewed",
@@ -507,7 +508,7 @@
         "closed": "Closed"
       },
       "reportedOn": "Date",
-      "moreDetails": "Report Details",
+      "moreDetails": "View Details",
       "decideModal": {
         "submit": "Confirm decision",
         "cancel": "Cancel",

From 3de205d7c23a2389a489f38bf28e0813f4027c3a Mon Sep 17 00:00:00 2001
From: Alina Beck <alina.beck@mail.com>
Date: Tue, 3 Dec 2019 14:03:31 +0300
Subject: [PATCH 158/174] style nested table

---
 .../_new/features/FiledTable/FiledTable.vue   | 42 +++++++++++--------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/webapp/components/_new/features/FiledTable/FiledTable.vue b/webapp/components/_new/features/FiledTable/FiledTable.vue
index 246e8c754..1215de34f 100644
--- a/webapp/components/_new/features/FiledTable/FiledTable.vue
+++ b/webapp/components/_new/features/FiledTable/FiledTable.vue
@@ -1,22 +1,20 @@
 <template>
-  <ds-space margin-bottom="base">
-    <ds-table v-if="filed && filed.length" :data="filed" :fields="reportFields" condensed>
-      <template #submitter="scope">
-        <hc-user :user="scope.row.submitter" :showAvatar="false" :trunc="30" />
-      </template>
-      <template #reportedOn="scope">
-        <ds-text size="small">
-          <hc-relative-date-time :date-time="scope.row.createdAt" />
-        </ds-text>
-      </template>
-      <template #reasonCategory="scope">
-        {{ $t('report.reason.category.options.' + scope.row.reasonCategory) }}
-      </template>
-      <template #reasonDescription="scope">
-        {{ scope.row.reasonDescription.length ? scope.row.reasonDescription : '—' }}
-      </template>
-    </ds-table>
-  </ds-space>
+  <ds-table class="nested-table" v-if="filed && filed.length" :data="filed" :fields="reportFields" condensed>
+    <template #submitter="scope">
+      <hc-user :user="scope.row.submitter" :showAvatar="false" :trunc="30" />
+    </template>
+    <template #reportedOn="scope">
+      <ds-text size="small">
+        <hc-relative-date-time :date-time="scope.row.createdAt" />
+      </ds-text>
+    </template>
+    <template #reasonCategory="scope">
+      {{ $t('report.reason.category.options.' + scope.row.reasonCategory) }}
+    </template>
+    <template #reasonDescription="scope">
+      {{ scope.row.reasonDescription.length ? scope.row.reasonDescription : '—' }}
+    </template>
+  </ds-table>
 </template>
 <script>
 import HcUser from '~/components/User/User'
@@ -54,3 +52,11 @@ export default {
   },
 }
 </script>
+
+<style lang="scss">
+.nested-table {
+  padding: $space-small;
+  border-top: $border-size-base solid $color-neutral-60;
+  border-bottom: $border-size-base solid $color-neutral-60;
+}
+</style>

From 750a1e523fa0474d3c268d38561d53de8769cd7d Mon Sep 17 00:00:00 2001
From: Alina Beck <alina.beck@mail.com>
Date: Tue, 3 Dec 2019 18:42:48 +0300
Subject: [PATCH 159/174] extract ReportRow into separate component

---
 .../_new/features/FiledTable/FiledTable.vue   |   8 +-
 .../_new/features/ReportRow/ReportRow.vue     | 186 +++++++++++++++
 .../features/ReportsTable/ReportsTable.vue    | 215 ++----------------
 3 files changed, 206 insertions(+), 203 deletions(-)
 create mode 100644 webapp/components/_new/features/ReportRow/ReportRow.vue

diff --git a/webapp/components/_new/features/FiledTable/FiledTable.vue b/webapp/components/_new/features/FiledTable/FiledTable.vue
index 1215de34f..20b00b82e 100644
--- a/webapp/components/_new/features/FiledTable/FiledTable.vue
+++ b/webapp/components/_new/features/FiledTable/FiledTable.vue
@@ -1,5 +1,11 @@
 <template>
-  <ds-table class="nested-table" v-if="filed && filed.length" :data="filed" :fields="reportFields" condensed>
+  <ds-table
+    class="nested-table"
+    v-if="filed && filed.length"
+    :data="filed"
+    :fields="reportFields"
+    condensed
+  >
     <template #submitter="scope">
       <hc-user :user="scope.row.submitter" :showAvatar="false" :trunc="30" />
     </template>
diff --git a/webapp/components/_new/features/ReportRow/ReportRow.vue b/webapp/components/_new/features/ReportRow/ReportRow.vue
new file mode 100644
index 000000000..379828121
--- /dev/null
+++ b/webapp/components/_new/features/ReportRow/ReportRow.vue
@@ -0,0 +1,186 @@
+<template>
+  <tbody class="report-row">
+    <tr>
+      <!-- Icon Column -->
+      <td class="ds-table-col">
+        <base-icon :name="iconName" :title="iconLabel" />
+      </td>
+
+      <!-- Number of Filed Reports Column -->
+      <td class="ds-table-col">
+        <span class="user-count">
+          {{ $t('moderation.reports.numberOfUsers', { count: report.filed.length }) }}
+        </span>
+        <ds-button size="small" @click="showFiledReports = !showFiledReports">
+          {{ $t('moderation.reports.moreDetails') }}
+        </ds-button>
+      </td>
+
+      <!-- Content Column -->
+      <td class="ds-table-col">
+        <client-only v-if="isUser">
+          <hc-user
+            :user="report.resource"
+            :showAvatar="false"
+            :trunc="30"
+            :data-test="report.resource.slug"
+          />
+        </client-only>
+        <nuxt-link v-else class="title" :to="linkTarget">
+          {{ linkText | truncate(50) }}
+        </nuxt-link>
+      </td>
+
+      <!-- Author Column -->
+      <td class="ds-table-col">
+        <client-only v-if="!isUser">
+          <hc-user
+            :user="report.resource.author"
+            :showAvatar="false"
+            :trunc="30"
+            :data-test="report.resource.author.slug"
+          />
+        </client-only>
+        <span v-else>—</span>
+      </td>
+
+      <!-- Status Column -->
+      <td class="ds-table-col">
+        <span class="status-line">
+          <base-icon :name="statusIconName" :class="isDisabled ? 'ban' : 'no-ban'" />
+          {{ statusText }}
+        </span>
+        <client-only v-if="report.reviewed">
+          <hc-user
+            :user="moderatorOfLatestReview"
+            :showAvatar="false"
+            :trunc="30"
+            :date-time="report.updatedAt"
+            positionDatetime="below"
+          />
+        </client-only>
+      </td>
+
+      <!-- Decision Column -->
+      <td class="ds-table-col">
+        <b v-if="report.closed" data-test="closed">
+          {{ $t('moderation.reports.decided') }}
+        </b>
+        <ds-button
+          v-else
+          danger
+          class="confirm"
+          size="small"
+          :icon="statusIconName"
+          @click="$emit('confirm-report')"
+        >
+          {{ $t('moderation.reports.decideButton') }}
+        </ds-button>
+      </td>
+    </tr>
+
+    <tr class="row">
+      <td colspan="100%">
+        <filed-table :filed="report.filed" v-if="showFiledReports" />
+      </td>
+    </tr>
+  </tbody>
+</template>
+
+<script>
+import FiledTable from '~/components/_new/features/FiledTable/FiledTable'
+import HcUser from '~/components/User/User'
+
+export default {
+  components: {
+    FiledTable,
+    HcUser,
+  },
+  props: {
+    report: {
+      type: Object,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      showFiledReports: false,
+    }
+  },
+  computed: {
+    isPost() {
+      return this.report.resource.__typename === 'Post'
+    },
+    isComment() {
+      return this.report.resource.__typename === 'Comment'
+    },
+    isUser() {
+      return this.report.resource.__typename === 'User'
+    },
+    isDisabled() {
+      return this.report.resource.disabled
+    },
+    iconName() {
+      if (this.isPost) return 'bookmark'
+      else if (this.isComment) return 'comments'
+      else if (this.isUser) return 'user'
+      else return null
+    },
+    iconLabel() {
+      if (this.isPost) return this.$t('report.contribution.type')
+      else if (this.isComment) return this.$t('report.comment.type')
+      else if (this.isUser) return this.$t('report.user.type')
+      else return null
+    },
+    linkTarget() {
+      const { id, slug } = this.isComment ? this.report.resource.post : this.report.resource
+      return {
+        name: 'post-id-slug',
+        params: { id, slug },
+        hash: this.isComment ? `#commentId-${this.report.resource.id}` : '',
+      }
+    },
+    linkText() {
+      return (
+        this.report.resource.title || this.$filters.removeHtml(this.report.resource.contentExcerpt)
+      )
+    },
+    statusIconName() {
+      return this.isDisabled ? 'eye-slash' : 'eye'
+    },
+    statusText() {
+      if (!this.report.reviewed) return this.$t('moderation.reports.enabled')
+      else if (this.isDisabled) return this.$t('moderation.reports.disabledBy')
+      else return this.$t('moderation.reports.enabledBy')
+    },
+    moderatorOfLatestReview() {
+      return this.report.reviewed[0].moderator
+    },
+  },
+}
+</script>
+
+<style lang="scss">
+.report-row {
+  &:nth-child(2n + 1) {
+    background-color: $color-neutral-95;
+  }
+
+  .title {
+    font-weight: $font-weight-bold;
+  }
+
+  .status-line {
+    display: inline-flex;
+
+    > .base-icon {
+      margin-right: $space-xx-small;
+    }
+  }
+
+  .user-count {
+    display: block;
+    margin-bottom: $space-xx-small;
+  }
+}
+</style>
diff --git a/webapp/components/_new/features/ReportsTable/ReportsTable.vue b/webapp/components/_new/features/ReportsTable/ReportsTable.vue
index 666339685..e172b1863 100644
--- a/webapp/components/_new/features/ReportsTable/ReportsTable.vue
+++ b/webapp/components/_new/features/ReportsTable/ReportsTable.vue
@@ -7,10 +7,10 @@
   >
     <colgroup>
       <col width="4%" />
-      <col width="12%" />
-      <col width="40%" />
-      <col width="16%" />
-      <col width="16%" />
+      <col width="14%" />
+      <col width="36%" />
+      <col width="14%" />
+      <col width="20%" />
       <col width="12%" />
     </colgroup>
     <thead class="ds-table-col ds-table-head-col">
@@ -23,217 +23,28 @@
         <th class="ds-table-head-col">{{ $t('moderation.reports.decision') }}</th>
       </tr>
     </thead>
-    <tbody>
-      <template v-for="report in reports">
-        <tr :key="report.resource.id" valign="top" class="row" :data-test="report.resource.__typename">
-          <td class="ds-table-col">
-            <ds-text color="soft">
-              <base-icon
-                v-if="isPost(report.resource)"
-                v-tooltip="{ report: $t('report.contribution.type'), placement: 'right' }"
-                name="bookmark"
-              />
-              <base-icon
-                v-else-if="isComment(report.resource)"
-                v-tooltip="{ report: $t('report.comment.type'), placement: 'right' }"
-                name="comments"
-              />
-              <base-icon
-                v-else-if="isUser(report.resource)"
-                v-tooltip="{ report: $t('report.user.type'), placement: 'right' }"
-                name="user"
-              />
-            </ds-text>
-          </td>
-          <td class="ds-table-col">
-            <span class="user-count">
-              {{ $t('moderation.reports.numberOfUsers', { count: report.filed.length }) }}
-            </span>
-            <ds-button size="small" @click="showFiledReports = !showFiledReports">
-              {{ $t('moderation.reports.moreDetails') }}
-            </ds-button>
-          </td>
-          <td class="ds-table-col">
-            <div v-if="isPost(report.resource) || isComment(report.resource)">
-              <nuxt-link
-                data-test="post-link"
-                :to="{
-                  name: 'post-id-slug',
-                  params: params(report.resource),
-                  hash: hashParam(report.resource),
-                }"
-              >
-                <b>
-                  {{
-                    report.resource.title ||
-                      $filters.removeHtml(report.resource.contentExcerpt) | truncate(50)
-                  }}
-                </b>
-              </nuxt-link>
-            </div>
-            <div v-else>
-              <client-only>
-                <hc-user
-                  :user="report.resource"
-                  :showAvatar="false"
-                  :trunc="30"
-                  :data-test="report.resource.slug"
-                />
-              </client-only>
-            </div>
-          </td>
-          <td class="ds-table-col">
-            <client-only>
-              <hc-user
-                v-if="report.resource.__typename !== 'User'"
-                :user="report.resource.author"
-                :showAvatar="false"
-                :trunc="30"
-                :data-test="report.resource.author.slug"
-              />
-              <span v-else>—</span>
-            </client-only>
-          </td>
-          <td class="ds-table-col">
-            <template v-if="report.reviewed">
-              <span v-if="report.resource.disabled" data-test="disabled" class="status-line">
-                <base-icon name="eye-slash" class="ban" />
-                {{ $t('moderation.reports.disabledBy') }}
-              </span>
-              <span v-else data-test="enabled" class="status-line">
-                <base-icon name="eye" class="no-ban" />
-                {{ $t('moderation.reports.enabledBy') }}
-              </span>
-              <client-only>
-                <hc-user
-                  :user="moderatorOfLatestReview(report)"
-                  :showAvatar="false"
-                  :trunc="30"
-                  :date-time="report.updatedAt"
-                  positionDatetime="below"
-                  :data-test="moderatorOfLatestReview(report).slug"
-                />
-              </client-only>
-            </template>
-            <div v-else>
-              <div data-test="unreviewed">
-                <base-icon name="eye" class="no-ban" />
-                {{ $t('moderation.reports.enabled') }}
-              </div>
-            </div>
-          </td>
-          <td class="ds-table-col">
-            <b v-if="report.closed" data-test="closed">
-              {{ $t('moderation.reports.decided') }}
-            </b>
-            <ds-button
-              v-else
-              danger
-              class="confirm"
-              size="small"
-              :icon="report.resource.disabled ? 'eye-slash' : 'eye'"
-              @click="confirm(report)"
-            >
-              {{ $t('moderation.reports.decideButton') }}
-            </ds-button>
-          </td>
-        </tr>
-        <tr :key="'nested-table-' + report.resource.id" class="row">
-          <td colspan="100%">
-            <filed-table :filed="report.filed" v-if="showFiledReports" />
-          </td>
-        </tr>
-      </template>
-    </tbody>
+    <template v-for="report in reports">
+      <report-row
+        :key="report.resource.id"
+        :report="report"
+        @confirm-report="$emit('confirm', report)"
+      />
+    </template>
   </table>
   <hc-empty v-else icon="alert" :message="$t('moderation.reports.empty')" />
 </template>
 
 <script>
-import CounterIcon from '~/components/_new/generic/CounterIcon/CounterIcon'
-import HcUser from '~/components/User/User'
-import FiledTable from '~/components/_new/features/FiledTable/FiledTable'
 import HcEmpty from '~/components/Empty/Empty'
+import ReportRow from '~/components/_new/features/ReportRow/ReportRow'
 
 export default {
   components: {
-    CounterIcon,
-    HcUser,
-    FiledTable,
     HcEmpty,
-  },
-  data() {
-    return {
-      showFiledReports: false,
-    }
+    ReportRow,
   },
   props: {
     reports: { type: Array, default: () => [] },
   },
-  methods: {
-    confirm(report) {
-      this.$emit('confirm', report)
-    },
-    isComment(resource) {
-      return resource.__typename === 'Comment'
-    },
-    isPost(resource) {
-      return resource.__typename === 'Post'
-    },
-    isUser(resource) {
-      return resource.__typename === 'User'
-    },
-    moderatorOfLatestReview(report) {
-      return report.reviewed[0].moderator
-    },
-    params(resource) {
-      const post = this.isComment(resource) ? resource.post : resource
-      return {
-        id: post.id,
-        slug: post.slug,
-      }
-    },
-    hashParam(resource) {
-      return this.isComment(resource) ? `#commentId-${resource.id}` : ''
-    },
-  },
 }
 </script>
-<style lang="scss">
-.reports-table {
-  .row {
-    position: relative;
-  }
-
-  .row:nth-child(4n+1) {
-    background-color: $color-neutral-95;
-  }
-
-  .row:nth-child(4n+2) {
-    background-color: $color-neutral-95;
-  }
-}
-
-.status-line {
-  display: inline-flex;
-
-  > .base-icon {
-    margin-right: $space-xx-small;
-  }
-}
-
-.user-count {
-  display: block;
-  margin-bottom: $space-xx-small;
-}
-
-.nested-table-toggle {
-  position: absolute;
-  left: 0;
-  bottom: 0;
-}
-
-.filed-table {
-  padding-left: $space-xx-large;
-}
-</style>

From b3640659bb608cc34edc6f2aca350f07dd2b9ce6 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Tue, 3 Dec 2019 17:55:20 +0100
Subject: [PATCH 160/174] Add missing unit tests/refactor code

- Refactoring without tests makes it riskier
- Move some tests from resolver to middleware unit tests to live closer
to where the validation happens, remove duplicate tests
- DRY out code
---
 .../validation/validationMiddleware.js        |   5 +-
 .../validation/validationMiddleware.spec.js   | 244 ++++++++++++++++++
 backend/src/schema/resolvers/comments.spec.js |  47 ----
 backend/src/schema/resolvers/posts.spec.js    | 115 ---------
 backend/src/schema/resolvers/statistics.js    |   2 +-
 .../src/schema/resolvers/statistics.spec.js   | 140 ++++++++++
 .../features/FiledTable/FiledTable.spec.js    | 110 ++++++++
 .../features/FiledTable/FiledTable.story.js   |  28 ++
 8 files changed, 525 insertions(+), 166 deletions(-)
 create mode 100644 backend/src/middleware/validation/validationMiddleware.spec.js
 create mode 100644 backend/src/schema/resolvers/statistics.spec.js
 create mode 100644 webapp/components/_new/features/FiledTable/FiledTable.spec.js
 create mode 100644 webapp/components/_new/features/FiledTable/FiledTable.story.js

diff --git a/backend/src/middleware/validation/validationMiddleware.js b/backend/src/middleware/validation/validationMiddleware.js
index 024e594bf..4954a5584 100644
--- a/backend/src/middleware/validation/validationMiddleware.js
+++ b/backend/src/middleware/validation/validationMiddleware.js
@@ -5,7 +5,7 @@ const NO_POST_ERR_MESSAGE = 'Comment cannot be created without a post!'
 const NO_CATEGORIES_ERR_MESSAGE =
   'You cannot save a post without at least one category or more than three'
 
-const validateCommentCreation = async (resolve, root, args, context, info) => {
+const validateCreateComment = async (resolve, root, args, context, info) => {
   const content = args.content.replace(/<(?:.|\n)*?>/gm, '').trim()
   const { postId } = args
 
@@ -37,7 +37,6 @@ const validateCommentCreation = async (resolve, root, args, context, info) => {
 }
 
 const validateUpdateComment = async (resolve, root, args, context, info) => {
-  const COMMENT_MIN_LENGTH = 1
   const content = args.content.replace(/<(?:.|\n)*?>/gm, '').trim()
   if (!args.content || content.length < COMMENT_MIN_LENGTH) {
     throw new UserInputError(`Comment must be at least ${COMMENT_MIN_LENGTH} character long!`)
@@ -91,7 +90,7 @@ const validateReport = async (resolve, root, args, context, info) => {
 
 export default {
   Mutation: {
-    CreateComment: validateCommentCreation,
+    CreateComment: validateCreateComment,
     UpdateComment: validateUpdateComment,
     CreatePost: validatePost,
     UpdatePost: validateUpdatePost,
diff --git a/backend/src/middleware/validation/validationMiddleware.spec.js b/backend/src/middleware/validation/validationMiddleware.spec.js
new file mode 100644
index 000000000..ec5f3e012
--- /dev/null
+++ b/backend/src/middleware/validation/validationMiddleware.spec.js
@@ -0,0 +1,244 @@
+import { gql } from '../../helpers/jest'
+import Factory from '../../seed/factories'
+import { neode as getNeode, getDriver } from '../../bootstrap/neo4j'
+import { createTestClient } from 'apollo-server-testing'
+import createServer from '../../server'
+
+const factory = Factory()
+const neode = getNeode()
+const driver = getDriver()
+let mutate, authenticatedUser, user
+const createCommentMutation = gql`
+  mutation($id: ID, $postId: ID!, $content: String!) {
+    CreateComment(id: $id, postId: $postId, content: $content) {
+      id
+    }
+  }
+`
+const updateCommentMutation = gql`
+  mutation($content: String!, $id: ID!) {
+    UpdateComment(content: $content, id: $id) {
+      id
+    }
+  }
+`
+const createPostMutation = gql`
+  mutation($id: ID, $title: String!, $content: String!, $categoryIds: [ID]) {
+    CreatePost(id: $id, title: $title, content: $content, categoryIds: $categoryIds) {
+      id
+    }
+  }
+`
+
+const updatePostMutation = gql`
+  mutation($id: ID!, $title: String!, $content: String!, $categoryIds: [ID]) {
+    UpdatePost(id: $id, title: $title, content: $content, categoryIds: $categoryIds) {
+      id
+    }
+  }
+`
+
+beforeAll(() => {
+  const { server } = createServer({
+    context: () => {
+      return {
+        user: authenticatedUser,
+        neode,
+        driver,
+      }
+    },
+  })
+  mutate = createTestClient(server).mutate
+})
+
+beforeEach(async () => {
+  user = await factory.create('User', {
+    id: 'user-id',
+  })
+  await factory.create('Post', {
+    id: 'post-4-commenting',
+    authorId: 'user-id',
+  })
+})
+
+afterEach(async () => {
+  await factory.cleanDatabase()
+})
+
+describe('validateCreateComment', () => {
+  let createCommentVariables
+  beforeEach(async () => {
+    createCommentVariables = {
+      postId: 'whatever',
+      content: '',
+    }
+    authenticatedUser = await user.toJson()
+  })
+
+  it('throws an error if content is empty', async () => {
+    createCommentVariables = { ...createCommentVariables, postId: 'post-4-commenting' }
+    await expect(
+      mutate({ mutation: createCommentMutation, variables: createCommentVariables }),
+    ).resolves.toMatchObject({
+      data: { CreateComment: null },
+      errors: [{ message: 'Comment must be at least 1 character long!' }],
+    })
+  })
+
+  it('sanitizes content and throws an error if not longer than 1 character', async () => {
+    createCommentVariables = { postId: 'post-4-commenting', content: '<a></a>' }
+    await expect(
+      mutate({ mutation: createCommentMutation, variables: createCommentVariables }),
+    ).resolves.toMatchObject({
+      data: { CreateComment: null },
+      errors: [{ message: 'Comment must be at least 1 character long!' }],
+    })
+  })
+
+  it('throws an error if there is no post with given id in the database', async () => {
+    createCommentVariables = {
+      ...createCommentVariables,
+      postId: 'non-existent-post',
+      content: 'valid content',
+    }
+    await expect(
+      mutate({ mutation: createCommentMutation, variables: createCommentVariables }),
+    ).resolves.toMatchObject({
+      data: { CreateComment: null },
+      errors: [{ message: 'Comment cannot be created without a post!' }],
+    })
+  })
+
+  describe('validateUpdateComment', () => {
+    let updateCommentVariables
+    beforeEach(async () => {
+      await factory.create('Comment', {
+        id: 'comment-id',
+        authorId: 'user-id',
+      })
+      updateCommentVariables = {
+        id: 'whatever',
+        content: '',
+      }
+      authenticatedUser = await user.toJson()
+    })
+
+    it('throws an error if content is empty', async () => {
+      updateCommentVariables = { ...updateCommentVariables, id: 'comment-id' }
+      await expect(
+        mutate({ mutation: updateCommentMutation, variables: updateCommentVariables }),
+      ).resolves.toMatchObject({
+        data: { UpdateComment: null },
+        errors: [{ message: 'Comment must be at least 1 character long!' }],
+      })
+    })
+
+    it('sanitizes content and throws an error if not longer than 1 character', async () => {
+      updateCommentVariables = { id: 'comment-id', content: '<a></a>' }
+      await expect(
+        mutate({ mutation: updateCommentMutation, variables: updateCommentVariables }),
+      ).resolves.toMatchObject({
+        data: { UpdateComment: null },
+        errors: [{ message: 'Comment must be at least 1 character long!' }],
+      })
+    })
+  })
+
+  describe('validatePost', () => {
+    let createPostVariables
+    beforeEach(async () => {
+      createPostVariables = {
+        title: 'I am  a title',
+        content: 'Some content',
+      }
+      authenticatedUser = await user.toJson()
+    })
+
+    describe('categories', () => {
+      describe('null', () => {
+        it('throws UserInputError', async () => {
+          createPostVariables = { ...createPostVariables, categoryIds: null }
+          await expect(
+            mutate({ mutation: createPostMutation, variables: createPostVariables }),
+          ).resolves.toMatchObject({
+            data: { CreatePost: null },
+            errors: [
+              {
+                message: 'You cannot save a post without at least one category or more than three',
+              },
+            ],
+          })
+        })
+      })
+
+      describe('empty', () => {
+        it('throws UserInputError', async () => {
+          createPostVariables = { ...createPostVariables, categoryIds: [] }
+          await expect(
+            mutate({ mutation: createPostMutation, variables: createPostVariables }),
+          ).resolves.toMatchObject({
+            data: { CreatePost: null },
+            errors: [
+              {
+                message: 'You cannot save a post without at least one category or more than three',
+              },
+            ],
+          })
+        })
+      })
+
+      describe('more than 3 categoryIds', () => {
+        it('throws UserInputError', async () => {
+          createPostVariables = {
+            ...createPostVariables,
+            categoryIds: ['cat9', 'cat27', 'cat15', 'cat4'],
+          }
+          await expect(
+            mutate({ mutation: createPostMutation, variables: createPostVariables }),
+          ).resolves.toMatchObject({
+            data: { CreatePost: null },
+            errors: [
+              {
+                message: 'You cannot save a post without at least one category or more than three',
+              },
+            ],
+          })
+        })
+      })
+    })
+  })
+
+  describe('validateUpdatePost', () => {
+    describe('post created without categories somehow', () => {
+      let owner, updatePostVariables
+      beforeEach(async () => {
+        const postSomehowCreated = await neode.create('Post', {
+          id: 'how-was-this-created',
+        })
+        owner = await neode.create('User', {
+          id: 'author-of-post-without-category',
+          slug: 'hacker',
+        })
+        await postSomehowCreated.relateTo(owner, 'author')
+        authenticatedUser = await owner.toJson()
+        updatePostVariables = {
+          id: 'how-was-this-created',
+          title: 'I am  a title',
+          content: 'Some content',
+          categoryIds: [],
+        }
+      })
+
+      it('requires at least one category for successful update', async () => {
+        await expect(
+          mutate({ mutation: updatePostMutation, variables: updatePostVariables }),
+        ).resolves.toMatchObject({
+          data: { UpdatePost: null },
+          errors: [
+            { message: 'You cannot save a post without at least one category or more than three' },
+          ],
+        })
+      })
+    })
+  })
+})
diff --git a/backend/src/schema/resolvers/comments.spec.js b/backend/src/schema/resolvers/comments.spec.js
index c0f86ffe3..d2692aa8a 100644
--- a/backend/src/schema/resolvers/comments.spec.js
+++ b/backend/src/schema/resolvers/comments.spec.js
@@ -111,42 +111,6 @@ describe('CreateComment', () => {
           },
         )
       })
-
-      describe('comment content is empty', () => {
-        beforeEach(() => {
-          variables = { ...variables, content: '<p></p>' }
-        })
-
-        it('throw UserInput error', async () => {
-          const { data, errors } = await mutate({ mutation: createCommentMutation, variables })
-          expect(data).toEqual({ CreateComment: null })
-          expect(errors[0]).toHaveProperty('message', 'Comment must be at least 1 character long!')
-        })
-      })
-
-      describe('comment content contains only whitespaces', () => {
-        beforeEach(() => {
-          variables = { ...variables, content: '   <p>   </p>   ' }
-        })
-
-        it('throw UserInput error', async () => {
-          const { data, errors } = await mutate({ mutation: createCommentMutation, variables })
-          expect(data).toEqual({ CreateComment: null })
-          expect(errors[0]).toHaveProperty('message', 'Comment must be at least 1 character long!')
-        })
-      })
-
-      describe('invalid post id', () => {
-        beforeEach(() => {
-          variables = { ...variables, postId: 'does-not-exist' }
-        })
-
-        it('throw UserInput error', async () => {
-          const { data, errors } = await mutate({ mutation: createCommentMutation, variables })
-          expect(data).toEqual({ CreateComment: null })
-          expect(errors[0]).toHaveProperty('message', 'Comment cannot be created without a post!')
-        })
-      })
     })
   })
 })
@@ -226,17 +190,6 @@ describe('UpdateComment', () => {
         expect(newlyCreatedComment.updatedAt).not.toEqual(UpdateComment.updatedAt)
       })
 
-      describe('if `content` empty', () => {
-        beforeEach(() => {
-          variables = { ...variables, content: '  <p> </p>' }
-        })
-
-        it('throws InputError', async () => {
-          const { errors } = await mutate({ mutation: updateCommentMutation, variables })
-          expect(errors[0]).toHaveProperty('message', 'Comment must be at least 1 character long!')
-        })
-      })
-
       describe('if comment does not exist for given id', () => {
         beforeEach(() => {
           variables = { ...variables, id: 'does-not-exist' }
diff --git a/backend/src/schema/resolvers/posts.spec.js b/backend/src/schema/resolvers/posts.spec.js
index d6a97191d..98475b182 100644
--- a/backend/src/schema/resolvers/posts.spec.js
+++ b/backend/src/schema/resolvers/posts.spec.js
@@ -316,53 +316,6 @@ describe('CreatePost', () => {
         )
       })
     })
-
-    describe('categories', () => {
-      describe('null', () => {
-        beforeEach(() => {
-          variables = { ...variables, categoryIds: null }
-        })
-        it('throws UserInputError', async () => {
-          const {
-            errors: [error],
-          } = await mutate({ mutation: createPostMutation, variables })
-          expect(error).toHaveProperty(
-            'message',
-            'You cannot save a post without at least one category or more than three',
-          )
-        })
-      })
-
-      describe('empty', () => {
-        beforeEach(() => {
-          variables = { ...variables, categoryIds: [] }
-        })
-        it('throws UserInputError', async () => {
-          const {
-            errors: [error],
-          } = await mutate({ mutation: createPostMutation, variables })
-          expect(error).toHaveProperty(
-            'message',
-            'You cannot save a post without at least one category or more than three',
-          )
-        })
-      })
-
-      describe('more than 3 items', () => {
-        beforeEach(() => {
-          variables = { ...variables, categoryIds: ['cat9', 'cat27', 'cat15', 'cat4'] }
-        })
-        it('throws UserInputError', async () => {
-          const {
-            errors: [error],
-          } = await mutate({ mutation: createPostMutation, variables })
-          expect(error).toHaveProperty(
-            'message',
-            'You cannot save a post without at least one category or more than three',
-          )
-        })
-      })
-    })
   })
 })
 
@@ -493,74 +446,6 @@ describe('UpdatePost', () => {
           expected,
         )
       })
-
-      describe('more than 3 categories', () => {
-        beforeEach(() => {
-          variables = { ...variables, categoryIds: ['cat9', 'cat27', 'cat15', 'cat4'] }
-        })
-
-        it('allows a maximum of three category for a successful update', async () => {
-          const {
-            errors: [error],
-          } = await mutate({ mutation: updatePostMutation, variables })
-          expect(error).toHaveProperty(
-            'message',
-            'You cannot save a post without at least one category or more than three',
-          )
-        })
-      })
-
-      describe('post created without categories somehow', () => {
-        let owner
-
-        beforeEach(async () => {
-          const postSomehowCreated = await neode.create('Post', {
-            id: 'how-was-this-created',
-          })
-          owner = await neode.create('User', {
-            id: 'author-of-post-without-category',
-            name: 'Hacker',
-            slug: 'hacker',
-            email: 'hacker@example.org',
-            password: '1234',
-          })
-          await postSomehowCreated.relateTo(owner, 'author')
-          authenticatedUser = await owner.toJson()
-          variables = { ...variables, id: 'how-was-this-created' }
-        })
-
-        it('throws an error if categoryIds is not an array', async () => {
-          const {
-            errors: [error],
-          } = await mutate({
-            mutation: updatePostMutation,
-            variables: {
-              ...variables,
-              categoryIds: null,
-            },
-          })
-          expect(error).toHaveProperty(
-            'message',
-            'You cannot save a post without at least one category or more than three',
-          )
-        })
-
-        it('requires at least one category for successful update', async () => {
-          const {
-            errors: [error],
-          } = await mutate({
-            mutation: updatePostMutation,
-            variables: {
-              ...variables,
-              categoryIds: [],
-            },
-          })
-          expect(error).toHaveProperty(
-            'message',
-            'You cannot save a post without at least one category or more than three',
-          )
-        })
-      })
     })
   })
 
diff --git a/backend/src/schema/resolvers/statistics.js b/backend/src/schema/resolvers/statistics.js
index e8745efea..07b9e4cea 100644
--- a/backend/src/schema/resolvers/statistics.js
+++ b/backend/src/schema/resolvers/statistics.js
@@ -1,6 +1,6 @@
 export default {
   Query: {
-    statistics: async (parent, args, { driver, user }) => {
+    statistics: async (_parent, _args, { driver }) => {
       const session = driver.session()
       const response = {}
       try {
diff --git a/backend/src/schema/resolvers/statistics.spec.js b/backend/src/schema/resolvers/statistics.spec.js
new file mode 100644
index 000000000..7ffa8ebd0
--- /dev/null
+++ b/backend/src/schema/resolvers/statistics.spec.js
@@ -0,0 +1,140 @@
+import { createTestClient } from 'apollo-server-testing'
+import Factory from '../../seed/factories'
+import { gql } from '../../helpers/jest'
+import { neode as getNeode, getDriver } from '../../bootstrap/neo4j'
+import createServer from '../../server'
+
+let query, authenticatedUser
+const factory = Factory()
+const instance = getNeode()
+const driver = getDriver()
+
+const statisticsQuery = gql`
+  query {
+    statistics {
+      countUsers
+      countPosts
+      countComments
+      countNotifications
+      countInvites
+      countFollows
+      countShouts
+    }
+  }
+`
+beforeAll(() => {
+  authenticatedUser = undefined
+  const { server } = createServer({
+    context: () => {
+      return {
+        driver,
+        neode: instance,
+        user: authenticatedUser,
+      }
+    },
+  })
+  query = createTestClient(server).query
+})
+
+afterEach(async () => {
+  await factory.cleanDatabase()
+})
+
+describe('statistics', () => {
+  describe('countUsers', () => {
+    beforeEach(async () => {
+      await Promise.all(
+        [...Array(6).keys()].map(() => {
+          return factory.create('User')
+        }),
+      )
+    })
+
+    it('returns the count of all users', async () => {
+      await expect(query({ query: statisticsQuery })).resolves.toMatchObject({
+        data: { statistics: { countUsers: 6 } },
+        errors: undefined,
+      })
+    })
+  })
+
+  describe('countPosts', () => {
+    beforeEach(async () => {
+      await Promise.all(
+        [...Array(3).keys()].map(() => {
+          return factory.create('Post')
+        }),
+      )
+    })
+
+    it('returns the count of all posts', async () => {
+      await expect(query({ query: statisticsQuery })).resolves.toMatchObject({
+        data: { statistics: { countPosts: 3 } },
+        errors: undefined,
+      })
+    })
+  })
+
+  describe('countComments', () => {
+    beforeEach(async () => {
+      await Promise.all(
+        [...Array(2).keys()].map(() => {
+          return factory.create('Comment')
+        }),
+      )
+    })
+
+    it('returns the count of all comments', async () => {
+      await expect(query({ query: statisticsQuery })).resolves.toMatchObject({
+        data: { statistics: { countComments: 2 } },
+        errors: undefined,
+      })
+    })
+  })
+
+  describe('countFollows', () => {
+    let users
+    beforeEach(async () => {
+      users = await Promise.all(
+        [...Array(2).keys()].map(() => {
+          return factory.create('User')
+        }),
+      )
+      await users[0].relateTo(users[1], 'following')
+    })
+
+    it('returns the count of all follows', async () => {
+      await expect(query({ query: statisticsQuery })).resolves.toMatchObject({
+        data: { statistics: { countFollows: 1 } },
+        errors: undefined,
+      })
+    })
+  })
+
+  describe('countShouts', () => {
+    let users, posts
+    beforeEach(async () => {
+      users = await Promise.all(
+        [...Array(2).keys()].map(() => {
+          return factory.create('User')
+        }),
+      )
+      posts = await Promise.all(
+        [...Array(3).keys()].map(() => {
+          return factory.create('Post')
+        }),
+      )
+      await Promise.all([
+        users[0].relateTo(posts[1], 'shouted'),
+        users[1].relateTo(posts[0], 'shouted'),
+      ])
+    })
+
+    it('returns the count of all shouts', async () => {
+      await expect(query({ query: statisticsQuery })).resolves.toMatchObject({
+        data: { statistics: { countShouts: 2 } },
+        errors: undefined,
+      })
+    })
+  })
+})
diff --git a/webapp/components/_new/features/FiledTable/FiledTable.spec.js b/webapp/components/_new/features/FiledTable/FiledTable.spec.js
new file mode 100644
index 000000000..6c923e8c9
--- /dev/null
+++ b/webapp/components/_new/features/FiledTable/FiledTable.spec.js
@@ -0,0 +1,110 @@
+import { config, mount, RouterLinkStub } from '@vue/test-utils'
+import Vuex from 'vuex'
+import FiledTable from './FiledTable'
+
+import { reports } from '~/components/_new/features/ReportsTable/ReportsTable.story.js'
+
+const localVue = global.localVue
+
+localVue.filter('truncate', string => string)
+
+config.stubs['client-only'] = '<span><slot /></span>'
+
+describe('FiledTable.vue', () => {
+  let wrapper, mocks, propsData, stubs, filed
+  const filedReport = reports[0]
+
+  beforeEach(() => {
+    mocks = {
+      $t: jest.fn(string => string),
+    }
+    stubs = {
+      NuxtLink: RouterLinkStub,
+    }
+    propsData = {}
+  })
+
+  describe('mount', () => {
+    const Wrapper = () => {
+      const store = new Vuex.Store({
+        getters: {
+          'auth/isModerator': () => true,
+          'auth/user': () => {
+            return { id: 'moderator' }
+          },
+        },
+      })
+      return mount(FiledTable, {
+        propsData,
+        mocks,
+        localVue,
+        store,
+        stubs,
+      })
+    }
+
+    beforeEach(() => {
+      wrapper = Wrapper()
+    })
+
+    describe('given reports', () => {
+      beforeEach(() => {
+        filed = reports.map(report => report.filed)
+        propsData.filed = filed[0]
+        wrapper = Wrapper()
+      })
+
+      it('renders a table', () => {
+        expect(wrapper.find('.ds-table').exists()).toBe(true)
+      })
+
+      describe('renders 4 columns', () => {
+        it('for icon', () => {
+          expect(wrapper.vm.fields.submitter).toBeTruthy()
+        })
+
+        it('for user', () => {
+          expect(wrapper.vm.fields.reportedOn).toBeTruthy()
+        })
+
+        it('for post', () => {
+          expect(wrapper.vm.fields.reasonCategory).toBeTruthy()
+        })
+
+        it('for content', () => {
+          expect(wrapper.vm.fields.reasonDescription).toBeTruthy()
+        })
+      })
+
+      describe('Filed', () => {
+        it('renders the reporting user', () => {
+          const communityModerator = wrapper.find('[data-test="community-moderator"]')
+          const username = communityModerator.find('.username')
+          expect(username.text()).toEqual('Community moderator')
+        })
+
+        it('renders the reported date', () => {
+          const dsTexts = wrapper.findAll('.ds-text')
+          const date = dsTexts.filter(element => element.text() === 'yesterday at 4:56 PM')
+          expect(date.exists()).toBe(true)
+        })
+
+        it.only('renders a link to the Post', () => {
+          const columns = wrapper.findAll('td')
+          const reasonCategory = columns.filter(category =>
+            category.text().includes('pornographic material'),
+          )
+          expect(reasonCategory.exists()).toBe(true)
+        })
+
+        it("renders the Post's content", () => {
+          const boldTags = secondRowNotification.findAll('b')
+          const content = boldTags.filter(
+            element => element.text() === commentNotification.from.contentExcerpt,
+          )
+          expect(content.exists()).toBe(true)
+        })
+      })
+    })
+  })
+})
diff --git a/webapp/components/_new/features/FiledTable/FiledTable.story.js b/webapp/components/_new/features/FiledTable/FiledTable.story.js
new file mode 100644
index 000000000..af796d3d6
--- /dev/null
+++ b/webapp/components/_new/features/FiledTable/FiledTable.story.js
@@ -0,0 +1,28 @@
+import { storiesOf } from '@storybook/vue'
+import { withA11y } from '@storybook/addon-a11y'
+import FiledTable from '~/components/_new/features/FiledTable/FiledTable'
+import helpers from '~/storybook/helpers'
+import { reports } from '~/components/_new/features/ReportsTable/ReportsTable.story.js'
+
+const filed = reports.map(report => report.filed)
+
+storiesOf('FiledTable', module)
+  .addDecorator(withA11y)
+  .addDecorator(helpers.layout)
+  .add('with filed reports', () => ({
+    components: { FiledTable },
+    store: helpers.store,
+    data: () => ({
+      filed,
+    }),
+    template: `<table>
+                <tbody  v-for="file in filed">
+                  <tr>
+                    <td class="ds-table-col filed-table" colspan="4">
+                      <ds-space margin-bottom="base" />
+                      <filed-table :filed="file" />
+                    </td>
+                  </tr>
+                </tbody>
+              </table>`,
+  }))

From b93f7c73cf7c919c66761ee67ce38492cf60ef62 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Tue, 3 Dec 2019 18:59:25 +0100
Subject: [PATCH 161/174] Remove unrelated files added accidentally

---
 .../features/FiledTable/FiledTable.spec.js    | 110 ------------------
 .../features/FiledTable/FiledTable.story.js   |  28 -----
 2 files changed, 138 deletions(-)
 delete mode 100644 webapp/components/_new/features/FiledTable/FiledTable.spec.js
 delete mode 100644 webapp/components/_new/features/FiledTable/FiledTable.story.js

diff --git a/webapp/components/_new/features/FiledTable/FiledTable.spec.js b/webapp/components/_new/features/FiledTable/FiledTable.spec.js
deleted file mode 100644
index 6c923e8c9..000000000
--- a/webapp/components/_new/features/FiledTable/FiledTable.spec.js
+++ /dev/null
@@ -1,110 +0,0 @@
-import { config, mount, RouterLinkStub } from '@vue/test-utils'
-import Vuex from 'vuex'
-import FiledTable from './FiledTable'
-
-import { reports } from '~/components/_new/features/ReportsTable/ReportsTable.story.js'
-
-const localVue = global.localVue
-
-localVue.filter('truncate', string => string)
-
-config.stubs['client-only'] = '<span><slot /></span>'
-
-describe('FiledTable.vue', () => {
-  let wrapper, mocks, propsData, stubs, filed
-  const filedReport = reports[0]
-
-  beforeEach(() => {
-    mocks = {
-      $t: jest.fn(string => string),
-    }
-    stubs = {
-      NuxtLink: RouterLinkStub,
-    }
-    propsData = {}
-  })
-
-  describe('mount', () => {
-    const Wrapper = () => {
-      const store = new Vuex.Store({
-        getters: {
-          'auth/isModerator': () => true,
-          'auth/user': () => {
-            return { id: 'moderator' }
-          },
-        },
-      })
-      return mount(FiledTable, {
-        propsData,
-        mocks,
-        localVue,
-        store,
-        stubs,
-      })
-    }
-
-    beforeEach(() => {
-      wrapper = Wrapper()
-    })
-
-    describe('given reports', () => {
-      beforeEach(() => {
-        filed = reports.map(report => report.filed)
-        propsData.filed = filed[0]
-        wrapper = Wrapper()
-      })
-
-      it('renders a table', () => {
-        expect(wrapper.find('.ds-table').exists()).toBe(true)
-      })
-
-      describe('renders 4 columns', () => {
-        it('for icon', () => {
-          expect(wrapper.vm.fields.submitter).toBeTruthy()
-        })
-
-        it('for user', () => {
-          expect(wrapper.vm.fields.reportedOn).toBeTruthy()
-        })
-
-        it('for post', () => {
-          expect(wrapper.vm.fields.reasonCategory).toBeTruthy()
-        })
-
-        it('for content', () => {
-          expect(wrapper.vm.fields.reasonDescription).toBeTruthy()
-        })
-      })
-
-      describe('Filed', () => {
-        it('renders the reporting user', () => {
-          const communityModerator = wrapper.find('[data-test="community-moderator"]')
-          const username = communityModerator.find('.username')
-          expect(username.text()).toEqual('Community moderator')
-        })
-
-        it('renders the reported date', () => {
-          const dsTexts = wrapper.findAll('.ds-text')
-          const date = dsTexts.filter(element => element.text() === 'yesterday at 4:56 PM')
-          expect(date.exists()).toBe(true)
-        })
-
-        it.only('renders a link to the Post', () => {
-          const columns = wrapper.findAll('td')
-          const reasonCategory = columns.filter(category =>
-            category.text().includes('pornographic material'),
-          )
-          expect(reasonCategory.exists()).toBe(true)
-        })
-
-        it("renders the Post's content", () => {
-          const boldTags = secondRowNotification.findAll('b')
-          const content = boldTags.filter(
-            element => element.text() === commentNotification.from.contentExcerpt,
-          )
-          expect(content.exists()).toBe(true)
-        })
-      })
-    })
-  })
-})
diff --git a/webapp/components/_new/features/FiledTable/FiledTable.story.js b/webapp/components/_new/features/FiledTable/FiledTable.story.js
deleted file mode 100644
index af796d3d6..000000000
--- a/webapp/components/_new/features/FiledTable/FiledTable.story.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import { storiesOf } from '@storybook/vue'
-import { withA11y } from '@storybook/addon-a11y'
-import FiledTable from '~/components/_new/features/FiledTable/FiledTable'
-import helpers from '~/storybook/helpers'
-import { reports } from '~/components/_new/features/ReportsTable/ReportsTable.story.js'
-
-const filed = reports.map(report => report.filed)
-
-storiesOf('FiledTable', module)
-  .addDecorator(withA11y)
-  .addDecorator(helpers.layout)
-  .add('with filed reports', () => ({
-    components: { FiledTable },
-    store: helpers.store,
-    data: () => ({
-      filed,
-    }),
-    template: `<table>
-                <tbody  v-for="file in filed">
-                  <tr>
-                    <td class="ds-table-col filed-table" colspan="4">
-                      <ds-space margin-bottom="base" />
-                      <filed-table :filed="file" />
-                    </td>
-                  </tr>
-                </tbody>
-              </table>`,
-  }))

From 148016e2bf18949277b297c832af867455833099 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= <git@roschaefer.de>
Date: Tue, 3 Dec 2019 21:43:47 +0100
Subject: [PATCH 162/174] Update
 backend/src/activitypub/routes/webfinger.spec.js

Co-Authored-By: mattwr18 <mattwr18@gmail.com>
---
 backend/src/activitypub/routes/webfinger.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/activitypub/routes/webfinger.spec.js b/backend/src/activitypub/routes/webfinger.spec.js
index d78b77e4d..3acc364c9 100644
--- a/backend/src/activitypub/routes/webfinger.spec.js
+++ b/backend/src/activitypub/routes/webfinger.spec.js
@@ -50,7 +50,7 @@ describe('webfinger', () => {
     })
   })
 
-  describe('?ressource query param', () => {
+  describe('?resource query param', () => {
     describe('is missing acct:', () => {
       beforeEach(() => {
         resource = 'some-user@domain'

From a6dd6b4f3ace45257ce5256c542d05ab93b8133d Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Tue, 3 Dec 2019 21:49:17 +0100
Subject: [PATCH 163/174] Follow @mattwr18's suggestions

---
 backend/src/activitypub/routes/webfinger.spec.js | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/backend/src/activitypub/routes/webfinger.spec.js b/backend/src/activitypub/routes/webfinger.spec.js
index 3acc364c9..4e9b2196d 100644
--- a/backend/src/activitypub/routes/webfinger.spec.js
+++ b/backend/src/activitypub/routes/webfinger.spec.js
@@ -2,11 +2,7 @@ import { handler } from './webfinger'
 import Factory from '../../seed/factories'
 import { getDriver } from '../../bootstrap/neo4j'
 
-let resource
-let res
-let json
-let status
-let contentType
+let resource, res, json, status, contentType
 
 const factory = Factory()
 const driver = getDriver()
@@ -84,7 +80,7 @@ describe('webfinger', () => {
         resource = 'acct:some-user@domain'
       })
 
-      it('returns empty json', async () => {
+      it('returns error as json', async () => {
         await request()
         expect(status).toHaveBeenCalledWith(404)
         expect(json).toHaveBeenCalledWith({

From 84f574aaa0b0638c0bad90674b62a636b605584b Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Wed, 4 Dec 2019 00:22:28 +0100
Subject: [PATCH 164/174] Fix frontend tests

---
 .../_new/features/ReportRow/ReportRow.vue     | 31 ++++----
 .../ReportsTable/ReportsTable.spec.js         | 74 +++++++++----------
 .../ReportsTable/ReportsTable.story.js        |  2 +-
 3 files changed, 51 insertions(+), 56 deletions(-)

diff --git a/webapp/components/_new/features/ReportRow/ReportRow.vue b/webapp/components/_new/features/ReportRow/ReportRow.vue
index 379828121..55b1e0872 100644
--- a/webapp/components/_new/features/ReportRow/ReportRow.vue
+++ b/webapp/components/_new/features/ReportRow/ReportRow.vue
@@ -1,5 +1,12 @@
 <template>
-  <tbody class="report-row">
+  <tbody
+    :class="{
+      'report-row': true,
+      'report-comment': isComment,
+      'report-post': isPost,
+      'report-user': isUser,
+    }"
+  >
     <tr>
       <!-- Icon Column -->
       <td class="ds-table-col">
@@ -17,14 +24,9 @@
       </td>
 
       <!-- Content Column -->
-      <td class="ds-table-col">
+      <td class="ds-table-col report-content">
         <client-only v-if="isUser">
-          <hc-user
-            :user="report.resource"
-            :showAvatar="false"
-            :trunc="30"
-            :data-test="report.resource.slug"
-          />
+          <hc-user :user="report.resource" :showAvatar="false" :trunc="30" />
         </client-only>
         <nuxt-link v-else class="title" :to="linkTarget">
           {{ linkText | truncate(50) }}
@@ -32,20 +34,15 @@
       </td>
 
       <!-- Author Column -->
-      <td class="ds-table-col">
+      <td class="ds-table-col report-author">
         <client-only v-if="!isUser">
-          <hc-user
-            :user="report.resource.author"
-            :showAvatar="false"
-            :trunc="30"
-            :data-test="report.resource.author.slug"
-          />
+          <hc-user :user="report.resource.author" :showAvatar="false" :trunc="30" />
         </client-only>
         <span v-else>—</span>
       </td>
 
       <!-- Status Column -->
-      <td class="ds-table-col">
+      <td class="ds-table-col report-reviewer">
         <span class="status-line">
           <base-icon :name="statusIconName" :class="isDisabled ? 'ban' : 'no-ban'" />
           {{ statusText }}
@@ -63,7 +60,7 @@
 
       <!-- Decision Column -->
       <td class="ds-table-col">
-        <b v-if="report.closed" data-test="closed">
+        <b v-if="report.closed" class="report-closed">
           {{ $t('moderation.reports.decided') }}
         </b>
         <ds-button
diff --git a/webapp/components/_new/features/ReportsTable/ReportsTable.spec.js b/webapp/components/_new/features/ReportsTable/ReportsTable.spec.js
index 93be3ee6d..f5a250033 100644
--- a/webapp/components/_new/features/ReportsTable/ReportsTable.spec.js
+++ b/webapp/components/_new/features/ReportsTable/ReportsTable.spec.js
@@ -60,7 +60,7 @@ describe('ReportsTable', () => {
       describe('Comment', () => {
         let commentRow
         beforeEach(() => {
-          commentRow = wrapper.find('[data-test="Comment"]')
+          commentRow = wrapper.find('.report-comment')
         })
 
         it('renders a comments icon', () => {
@@ -69,32 +69,32 @@ describe('ReportsTable', () => {
         })
 
         it('renders a link to the post, with the comment contentExcerpt', () => {
-          const postLink = commentRow.find('[data-test="post-link"]')
+          const postLink = commentRow.find('.report-content a')
           expect(postLink.text()).toEqual('@peter-lustig Lorem ipsum dolor sit amet, …')
         })
 
         it('renders the author', () => {
-          const username = commentRow.find('[data-test="louie"] b')
+          const username = commentRow.find('.report-author b')
           expect(username.text()).toEqual('Louie')
         })
 
         describe('given it has been reviewed', () => {
           it('renders the enabled icon', () => {
-            const enabledIcon = commentRow
-              .findAll(BaseIcon)
-              .filter(icon => icon.props().name === 'eye')
-            expect(enabledIcon.exists()).toBe(true)
+            expect(
+              commentRow
+                .find('.status-line')
+                .find(BaseIcon)
+                .props().name,
+            ).toEqual('eye')
           })
 
           it('renders its current status', () => {
-            expect(commentRow.find('[data-test="enabled"]').text()).toEqual(
-              'moderation.reports.enabledBy',
-            )
+            expect(commentRow.find('.status-line').text()).toEqual('moderation.reports.enabledBy')
           })
 
           it('renders the moderator who reviewed the resource', () => {
-            const username = commentRow.find('[data-test="moderator"] b')
-            expect(username.text()).toEqual('Moderator')
+            const username = commentRow.find('.report-reviewer')
+            expect(username.text()).toContain('@moderator')
           })
         })
 
@@ -117,7 +117,7 @@ describe('ReportsTable', () => {
       describe('Post', () => {
         let postRow
         beforeEach(() => {
-          postRow = wrapper.find('[data-test="Post"]')
+          postRow = wrapper.find('.report-post')
         })
 
         it('renders a bookmark icon', () => {
@@ -126,27 +126,27 @@ describe('ReportsTable', () => {
         })
 
         it('renders a link to the post', () => {
-          const postLink = postRow.find('[data-test="post-link"]')
+          const postLink = postRow.find('.report-content a')
           expect(postLink.text()).toEqual("I'm a bigoted post!")
         })
 
         it('renders the author', () => {
-          const username = postRow.find('[data-test="dagobert"] b')
-          expect(username.text()).toEqual('Dagobert')
+          const username = postRow.find('.report-author')
+          expect(username.text()).toContain('Dagobert')
         })
 
         describe('given it has not been reviewed', () => {
           it('renders the enabled icon', () => {
-            const enabledIcon = postRow
-              .findAll(BaseIcon)
-              .filter(icon => icon.props().name === 'eye')
-            expect(enabledIcon.exists()).toBe(true)
+            expect(
+              postRow
+                .find('.status-line')
+                .find(BaseIcon)
+                .props().name,
+            ).toEqual('eye')
           })
 
           it('renders its current status', () => {
-            expect(postRow.find('[data-test="unreviewed"]').text()).toEqual(
-              'moderation.reports.enabled',
-            )
+            expect(postRow.find('.status-line').text()).toEqual('moderation.reports.enabled')
           })
         })
 
@@ -170,7 +170,7 @@ describe('ReportsTable', () => {
       describe('User', () => {
         let userRow
         beforeEach(() => {
-          userRow = wrapper.find('[data-test="User"]')
+          userRow = wrapper.find('.report-user')
         })
 
         it('renders a bookmark icon', () => {
@@ -179,35 +179,33 @@ describe('ReportsTable', () => {
         })
 
         it('renders a link to the user profile', () => {
-          const userLink = userRow.find('[data-test="abusive-user"] b')
-          expect(userLink.text()).toEqual('Abusive user')
+          const userLink = userRow.find('.report-content a')
+          expect(userLink.text()).toContain('Abusive user')
         })
 
         describe('given it has been reviewed', () => {
           it('renders the disabled icon', () => {
-            const disabledIcon = userRow
-              .findAll(BaseIcon)
-              .filter(icon => icon.props().name === 'eye-slash')
-            expect(disabledIcon.exists()).toBe(true)
+            expect(
+              userRow
+                .find('.status-line')
+                .find(BaseIcon)
+                .props().name,
+            ).toEqual('eye-slash')
           })
 
           it('renders its current status', () => {
-            expect(userRow.find('[data-test="disabled"]').text()).toEqual(
-              'moderation.reports.disabledBy',
-            )
+            expect(userRow.find('.status-line').text()).toEqual('moderation.reports.disabledBy')
           })
 
           it('renders the moderator who reviewed the resource', () => {
-            const username = userRow.find('[data-test="peter-lustig"] b')
-            expect(username.text()).toEqual('Peter Lustig')
+            const username = userRow.find('.report-reviewer')
+            expect(username.text()).toContain('Peter Lustig')
           })
         })
 
         describe('give report has been closed', () => {
           it('renders Decided text', () => {
-            expect(userRow.find('[data-test="closed"]').text()).toEqual(
-              'moderation.reports.decided',
-            )
+            expect(userRow.find('.report-closed').text()).toEqual('moderation.reports.decided')
           })
         })
       })
diff --git a/webapp/components/_new/features/ReportsTable/ReportsTable.story.js b/webapp/components/_new/features/ReportsTable/ReportsTable.story.js
index 425906564..3c7abec5d 100644
--- a/webapp/components/_new/features/ReportsTable/ReportsTable.story.js
+++ b/webapp/components/_new/features/ReportsTable/ReportsTable.story.js
@@ -88,7 +88,7 @@ export const reports = [
         slug: 'dagobert',
       },
       deleted: false,
-      disabled: true,
+      disabled: false,
       id: 'p2',
       slug: 'bigoted-post',
       title: "I'm a bigoted post!",

From d143d629edb9c21b59b791d2ac70071b3383ea6f Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Wed, 4 Dec 2019 01:17:14 +0100
Subject: [PATCH 165/174] Use data-test attributes, make test more resilient

as suggested by @mattwr18
---
 .../_new/features/ReportRow/ReportRow.vue     | 20 +++++++---------
 .../ReportsTable/ReportsTable.spec.js         | 24 ++++++++++---------
 2 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/webapp/components/_new/features/ReportRow/ReportRow.vue b/webapp/components/_new/features/ReportRow/ReportRow.vue
index 55b1e0872..a2d90b6b3 100644
--- a/webapp/components/_new/features/ReportRow/ReportRow.vue
+++ b/webapp/components/_new/features/ReportRow/ReportRow.vue
@@ -1,12 +1,5 @@
 <template>
-  <tbody
-    :class="{
-      'report-row': true,
-      'report-comment': isComment,
-      'report-post': isPost,
-      'report-user': isUser,
-    }"
-  >
+  <tbody class="report-row" :data-test="dataTest">
     <tr>
       <!-- Icon Column -->
       <td class="ds-table-col">
@@ -24,7 +17,7 @@
       </td>
 
       <!-- Content Column -->
-      <td class="ds-table-col report-content">
+      <td class="ds-table-col" data-test="report-content">
         <client-only v-if="isUser">
           <hc-user :user="report.resource" :showAvatar="false" :trunc="30" />
         </client-only>
@@ -34,7 +27,7 @@
       </td>
 
       <!-- Author Column -->
-      <td class="ds-table-col report-author">
+      <td class="ds-table-col" data-test="report-author">
         <client-only v-if="!isUser">
           <hc-user :user="report.resource.author" :showAvatar="false" :trunc="30" />
         </client-only>
@@ -42,7 +35,7 @@
       </td>
 
       <!-- Status Column -->
-      <td class="ds-table-col report-reviewer">
+      <td class="ds-table-col" data-test="report-reviewer">
         <span class="status-line">
           <base-icon :name="statusIconName" :class="isDisabled ? 'ban' : 'no-ban'" />
           {{ statusText }}
@@ -60,7 +53,7 @@
 
       <!-- Decision Column -->
       <td class="ds-table-col">
-        <b v-if="report.closed" class="report-closed">
+        <b v-if="report.closed" data-test="report-closed">
           {{ $t('moderation.reports.decided') }}
         </b>
         <ds-button
@@ -105,6 +98,9 @@ export default {
     }
   },
   computed: {
+    dataTest() {
+      return `report-${this.report.resource.__typename}`.toLowerCase()
+    },
     isPost() {
       return this.report.resource.__typename === 'Post'
     },
diff --git a/webapp/components/_new/features/ReportsTable/ReportsTable.spec.js b/webapp/components/_new/features/ReportsTable/ReportsTable.spec.js
index f5a250033..7825b9a16 100644
--- a/webapp/components/_new/features/ReportsTable/ReportsTable.spec.js
+++ b/webapp/components/_new/features/ReportsTable/ReportsTable.spec.js
@@ -60,7 +60,7 @@ describe('ReportsTable', () => {
       describe('Comment', () => {
         let commentRow
         beforeEach(() => {
-          commentRow = wrapper.find('.report-comment')
+          commentRow = wrapper.find('[data-test="report-comment"]')
         })
 
         it('renders a comments icon', () => {
@@ -69,12 +69,12 @@ describe('ReportsTable', () => {
         })
 
         it('renders a link to the post, with the comment contentExcerpt', () => {
-          const postLink = commentRow.find('.report-content a')
+          const postLink = commentRow.find('[data-test="report-content"] a')
           expect(postLink.text()).toEqual('@peter-lustig Lorem ipsum dolor sit amet, …')
         })
 
         it('renders the author', () => {
-          const username = commentRow.find('.report-author b')
+          const username = commentRow.find('[data-test="report-author"] b')
           expect(username.text()).toEqual('Louie')
         })
 
@@ -93,7 +93,7 @@ describe('ReportsTable', () => {
           })
 
           it('renders the moderator who reviewed the resource', () => {
-            const username = commentRow.find('.report-reviewer')
+            const username = commentRow.find('[data-test="report-reviewer"]')
             expect(username.text()).toContain('@moderator')
           })
         })
@@ -117,7 +117,7 @@ describe('ReportsTable', () => {
       describe('Post', () => {
         let postRow
         beforeEach(() => {
-          postRow = wrapper.find('.report-post')
+          postRow = wrapper.find('[data-test="report-post"]')
         })
 
         it('renders a bookmark icon', () => {
@@ -126,12 +126,12 @@ describe('ReportsTable', () => {
         })
 
         it('renders a link to the post', () => {
-          const postLink = postRow.find('.report-content a')
+          const postLink = postRow.find('[data-test="report-content"] a')
           expect(postLink.text()).toEqual("I'm a bigoted post!")
         })
 
         it('renders the author', () => {
-          const username = postRow.find('.report-author')
+          const username = postRow.find('[data-test="report-author"]')
           expect(username.text()).toContain('Dagobert')
         })
 
@@ -170,7 +170,7 @@ describe('ReportsTable', () => {
       describe('User', () => {
         let userRow
         beforeEach(() => {
-          userRow = wrapper.find('.report-user')
+          userRow = wrapper.find('[data-test="report-user"]')
         })
 
         it('renders a bookmark icon', () => {
@@ -179,7 +179,7 @@ describe('ReportsTable', () => {
         })
 
         it('renders a link to the user profile', () => {
-          const userLink = userRow.find('.report-content a')
+          const userLink = userRow.find('[data-test="report-content"] a')
           expect(userLink.text()).toContain('Abusive user')
         })
 
@@ -198,14 +198,16 @@ describe('ReportsTable', () => {
           })
 
           it('renders the moderator who reviewed the resource', () => {
-            const username = userRow.find('.report-reviewer')
+            const username = userRow.find('[data-test="report-reviewer"]')
             expect(username.text()).toContain('Peter Lustig')
           })
         })
 
         describe('give report has been closed', () => {
           it('renders Decided text', () => {
-            expect(userRow.find('.report-closed').text()).toEqual('moderation.reports.decided')
+            expect(userRow.find('[data-test="report-closed"]').text()).toEqual(
+              'moderation.reports.decided',
+            )
           })
         })
       })

From 68aabedc6d087bc45c7c679163defcd8852cd287 Mon Sep 17 00:00:00 2001
From: Alina Beck <alina.beck@mail.com>
Date: Wed, 4 Dec 2019 12:25:44 +0300
Subject: [PATCH 166/174] move css classes to the correct component files

---
 .../_new/features/ReportList/ReportList.vue    | 18 +-----------------
 .../_new/features/ReportRow/ReportRow.vue      | 10 +++++++++-
 2 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/webapp/components/_new/features/ReportList/ReportList.vue b/webapp/components/_new/features/ReportList/ReportList.vue
index b29362da5..0200e4cca 100644
--- a/webapp/components/_new/features/ReportList/ReportList.vue
+++ b/webapp/components/_new/features/ReportList/ReportList.vue
@@ -6,7 +6,7 @@
         <dropdown-filter @filter="filter" :filterOptions="filterOptions" :selected="selected" />
       </client-only>
     </div>
-    <reports-table :reports="reports" @confirm="confirm" />
+    <reports-table :reports="reports" @confirm="openModal" />
   </ds-card>
 </template>
 <script>
@@ -95,9 +95,6 @@ export default {
       this.reports = option.value
       this.selected = option.label
     },
-    confirm(report) {
-      this.openModal(report)
-    },
     async confirmCallback(resource) {
       const { disabled: disable, id: resourceId } = resource
       this.$apollo
@@ -142,17 +139,4 @@ export default {
     font-size: $font-size-large;
   }
 }
-
-.decision {
-  color: $color-secondary;
-}
-.no-decision {
-  color: $color-warning;
-}
-.ban {
-  color: $color-danger;
-}
-.no-ban {
-  color: $color-success;
-}
 </style>
diff --git a/webapp/components/_new/features/ReportRow/ReportRow.vue b/webapp/components/_new/features/ReportRow/ReportRow.vue
index a2d90b6b3..b8f2310cf 100644
--- a/webapp/components/_new/features/ReportRow/ReportRow.vue
+++ b/webapp/components/_new/features/ReportRow/ReportRow.vue
@@ -37,7 +37,7 @@
       <!-- Status Column -->
       <td class="ds-table-col" data-test="report-reviewer">
         <span class="status-line">
-          <base-icon :name="statusIconName" :class="isDisabled ? 'ban' : 'no-ban'" />
+          <base-icon :name="statusIconName" :class="isDisabled ? '--disabled' : '--enabled'" />
           {{ statusText }}
         </span>
         <client-only v-if="report.reviewed">
@@ -175,5 +175,13 @@ export default {
     display: block;
     margin-bottom: $space-xx-small;
   }
+
+  .--disabled {
+    color: $color-danger;
+  }
+
+  .--enabled {
+    color: $color-success;
+  }
 }
 </style>

From 26b4d4ab9352686cba3e4fb725a783fd7a4aaf41 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Wed, 4 Dec 2019 19:37:21 +0100
Subject: [PATCH 167/174] Add clock icon inside if clause

---
 webapp/components/User/User.vue | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/webapp/components/User/User.vue b/webapp/components/User/User.vue
index 5343b9e90..1a5c7d8af 100644
--- a/webapp/components/User/User.vue
+++ b/webapp/components/User/User.vue
@@ -17,20 +17,12 @@
           </div>
           <ds-text class="username" align="left" size="small" color="soft">
             {{ userName | truncate(18) }}
-            <base-icon name="clock" />
             <template v-if="dateTime">
+              <base-icon name="clock" />
               <hc-relative-date-time :date-time="dateTime" />
               <slot name="dateTime"></slot>
             </template>
           </ds-text>
-          <!-- dateTime: kind of same as above: make own component?
-          <ds-text v-if="positionDatetime === 'below' && dateTime" size="small" color="soft">
-            <base-icon name="clock" />
-            <client-only>
-              <hc-relative-date-time :date-time="dateTime" />
-            </client-only>
-            <slot name="dateTime"></slot>
-          </ds-text> -->
         </div>
       </nuxt-link>
     </template>
@@ -114,7 +106,6 @@ export default {
     showAvatar: { type: Boolean, default: true },
     trunc: { type: Number, default: 18 }, // "-1" is no trunc
     dateTime: { type: [Date, String], default: null },
-    // positionDatetime: { type: String, default: 'sideward' }, // 'below' is the otherone
   },
   computed: {
     ...mapGetters({

From 235702867d97b44dac37f8059f9194e23ba7f47d Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Wed, 4 Dec 2019 19:37:46 +0100
Subject: [PATCH 168/174] Move components to components/features

- we are reserving _new directory for components that have no dependency
on the Nitro-Styleguide
- update pat
---
 .../_new/features/FiledTable/FiledTable.vue   |  68 ------
 .../_new/features/ReportList/ReportList.vue   | 142 ------------
 .../_new/features/ReportRow/ReportRow.vue     | 185 ---------------
 .../ReportsTable/ReportsTable.spec.js         | 216 ------------------
 .../ReportsTable/ReportsTable.story.js        | 169 --------------
 .../features/ReportsTable/ReportsTable.vue    |  50 ----
 webapp/pages/moderation/index.vue             |   2 +-
 7 files changed, 1 insertion(+), 831 deletions(-)
 delete mode 100644 webapp/components/_new/features/FiledTable/FiledTable.vue
 delete mode 100644 webapp/components/_new/features/ReportList/ReportList.vue
 delete mode 100644 webapp/components/_new/features/ReportRow/ReportRow.vue
 delete mode 100644 webapp/components/_new/features/ReportsTable/ReportsTable.spec.js
 delete mode 100644 webapp/components/_new/features/ReportsTable/ReportsTable.story.js
 delete mode 100644 webapp/components/_new/features/ReportsTable/ReportsTable.vue

diff --git a/webapp/components/_new/features/FiledTable/FiledTable.vue b/webapp/components/_new/features/FiledTable/FiledTable.vue
deleted file mode 100644
index 20b00b82e..000000000
--- a/webapp/components/_new/features/FiledTable/FiledTable.vue
+++ /dev/null
@@ -1,68 +0,0 @@
-<template>
-  <ds-table
-    class="nested-table"
-    v-if="filed && filed.length"
-    :data="filed"
-    :fields="reportFields"
-    condensed
-  >
-    <template #submitter="scope">
-      <hc-user :user="scope.row.submitter" :showAvatar="false" :trunc="30" />
-    </template>
-    <template #reportedOn="scope">
-      <ds-text size="small">
-        <hc-relative-date-time :date-time="scope.row.createdAt" />
-      </ds-text>
-    </template>
-    <template #reasonCategory="scope">
-      {{ $t('report.reason.category.options.' + scope.row.reasonCategory) }}
-    </template>
-    <template #reasonDescription="scope">
-      {{ scope.row.reasonDescription.length ? scope.row.reasonDescription : '—' }}
-    </template>
-  </ds-table>
-</template>
-<script>
-import HcUser from '~/components/User/User'
-import HcRelativeDateTime from '~/components/RelativeDateTime'
-
-export default {
-  components: {
-    HcUser,
-    HcRelativeDateTime,
-  },
-  props: {
-    filed: { type: Array, default: () => [] },
-  },
-  computed: {
-    reportFields() {
-      return {
-        submitter: {
-          label: this.$t('moderation.reports.submitter'),
-          width: '15%',
-        },
-        reportedOn: {
-          label: this.$t('moderation.reports.reportedOn'),
-          width: '20%',
-        },
-        reasonCategory: {
-          label: this.$t('moderation.reports.reasonCategory'),
-          width: '30%',
-        },
-        reasonDescription: {
-          label: this.$t('moderation.reports.reasonDescription'),
-          width: '35%',
-        },
-      }
-    },
-  },
-}
-</script>
-
-<style lang="scss">
-.nested-table {
-  padding: $space-small;
-  border-top: $border-size-base solid $color-neutral-60;
-  border-bottom: $border-size-base solid $color-neutral-60;
-}
-</style>
diff --git a/webapp/components/_new/features/ReportList/ReportList.vue b/webapp/components/_new/features/ReportList/ReportList.vue
deleted file mode 100644
index 0200e4cca..000000000
--- a/webapp/components/_new/features/ReportList/ReportList.vue
+++ /dev/null
@@ -1,142 +0,0 @@
-<template>
-  <ds-card>
-    <div class="reports-header">
-      <h3 class="title">{{ $t('moderation.reports.name') }}</h3>
-      <client-only>
-        <dropdown-filter @filter="filter" :filterOptions="filterOptions" :selected="selected" />
-      </client-only>
-    </div>
-    <reports-table :reports="reports" @confirm="openModal" />
-  </ds-card>
-</template>
-<script>
-import { mapMutations } from 'vuex'
-import DropdownFilter from '~/components/DropdownFilter/DropdownFilter'
-import ReportsTable from '~/components/_new/features/ReportsTable/ReportsTable'
-import { reportsListQuery, reviewMutation } from '~/graphql/Moderation.js'
-
-export default {
-  components: {
-    DropdownFilter,
-    ReportsTable,
-  },
-  data() {
-    return {
-      reports: [],
-      allReports: [],
-      unreviewedReports: [],
-      reviewedReports: [],
-      closedReports: [],
-      selected: this.$t('moderation.reports.filterLabel.all'),
-    }
-  },
-  computed: {
-    filterOptions() {
-      return [
-        { label: this.$t('moderation.reports.filterLabel.all'), value: this.allReports },
-        {
-          label: this.$t('moderation.reports.filterLabel.unreviewed'),
-          value: this.unreviewedReports,
-        },
-        { label: this.$t('moderation.reports.filterLabel.reviewed'), value: this.reviewedReports },
-        { label: this.$t('moderation.reports.filterLabel.closed'), value: this.closedReports },
-      ]
-    },
-    modalData() {
-      return function(report) {
-        const identStart =
-          'moderation.reports.decideModal.' +
-          report.resource.__typename +
-          '.' +
-          (report.resource.disabled ? 'disable' : 'enable')
-        return {
-          name: 'confirm',
-          data: {
-            type: report.resource.__typename,
-            resource: report.resource,
-            modalData: {
-              titleIdent: identStart + '.title',
-              messageIdent: identStart + '.message',
-              messageParams: {
-                name:
-                  report.resource.name ||
-                  this.$filters.truncate(report.resource.title, 30) ||
-                  this.$filters.truncate(
-                    this.$filters.removeHtml(report.resource.contentExcerpt),
-                    30,
-                  ),
-              },
-              buttons: {
-                confirm: {
-                  danger: true,
-                  icon: report.resource.disabled ? 'eye-slash' : 'eye',
-                  textIdent: 'moderation.reports.decideModal.submit',
-                  callback: () => {
-                    this.confirmCallback(report.resource)
-                  },
-                },
-                cancel: {
-                  icon: 'close',
-                  textIdent: 'moderation.reports.decideModal.cancel',
-                  callback: () => {},
-                },
-              },
-            },
-          },
-        }
-      }
-    },
-  },
-  methods: {
-    ...mapMutations({
-      commitModalData: 'modal/SET_OPEN',
-    }),
-    filter(option) {
-      this.reports = option.value
-      this.selected = option.label
-    },
-    async confirmCallback(resource) {
-      const { disabled: disable, id: resourceId } = resource
-      this.$apollo
-        .mutate({
-          mutation: reviewMutation(),
-          variables: { disable, resourceId, closed: true },
-        })
-        .then(() => {
-          this.$toast.success(this.$t('moderation.reports.DecisionSuccess'))
-          this.$apollo.queries.reportsList.refetch()
-        })
-        .catch(error => this.$toast.error(error.message))
-    },
-    openModal(report) {
-      this.commitModalData(this.modalData(report))
-    },
-  },
-  apollo: {
-    reportsList: {
-      query: reportsListQuery(),
-      update({ reports }) {
-        this.reports = reports
-        this.allReports = reports
-        this.unreviewedReports = reports.filter(report => !report.reviewed)
-        this.reviewedReports = reports.filter(report => report.reviewed)
-        this.closedReports = reports.filter(report => report.closed)
-      },
-      fetchPolicy: 'cache-and-network',
-    },
-  },
-}
-</script>
-
-<style lang="scss">
-.reports-header {
-  display: flex;
-  justify-content: space-between;
-  margin: $space-small 0;
-
-  > .title {
-    margin: 0;
-    font-size: $font-size-large;
-  }
-}
-</style>
diff --git a/webapp/components/_new/features/ReportRow/ReportRow.vue b/webapp/components/_new/features/ReportRow/ReportRow.vue
deleted file mode 100644
index d1bfe8d05..000000000
--- a/webapp/components/_new/features/ReportRow/ReportRow.vue
+++ /dev/null
@@ -1,185 +0,0 @@
-<template>
-  <tbody class="report-row" :data-test="dataTest">
-    <tr>
-      <!-- Icon Column -->
-      <td class="ds-table-col">
-        <base-icon :name="iconName" :title="iconLabel" />
-      </td>
-
-      <!-- Number of Filed Reports Column -->
-      <td class="ds-table-col">
-        <span class="user-count">
-          {{ $t('moderation.reports.numberOfUsers', { count: report.filed.length }) }}
-        </span>
-        <ds-button size="small" @click="showFiledReports = !showFiledReports">
-          {{ $t('moderation.reports.moreDetails') }}
-        </ds-button>
-      </td>
-
-      <!-- Content Column -->
-      <td class="ds-table-col" data-test="report-content">
-        <client-only v-if="isUser">
-          <hc-user :user="report.resource" :showAvatar="false" :trunc="30" />
-        </client-only>
-        <nuxt-link v-else class="title" :to="linkTarget">
-          {{ linkText | truncate(50) }}
-        </nuxt-link>
-      </td>
-
-      <!-- Author Column -->
-      <td class="ds-table-col" data-test="report-author">
-        <client-only v-if="!isUser">
-          <hc-user :user="report.resource.author" :showAvatar="false" :trunc="30" />
-        </client-only>
-        <span v-else>—</span>
-      </td>
-
-      <!-- Status Column -->
-      <td class="ds-table-col" data-test="report-reviewer">
-        <span class="status-line">
-          <base-icon :name="statusIconName" :class="isDisabled ? '--disabled' : '--enabled'" />
-          {{ statusText }}
-        </span>
-        <client-only v-if="report.reviewed">
-          <hc-user
-            :user="moderatorOfLatestReview"
-            :showAvatar="false"
-            :trunc="30"
-            :date-time="report.updatedAt"
-          />
-        </client-only>
-      </td>
-
-      <!-- Decision Column -->
-      <td class="ds-table-col">
-        <b v-if="report.closed" data-test="report-closed">
-          {{ $t('moderation.reports.decided') }}
-        </b>
-        <ds-button
-          v-else
-          danger
-          size="small"
-          :icon="statusIconName"
-          @click="$emit('confirm-report')"
-        >
-          {{ $t('moderation.reports.decideButton') }}
-        </ds-button>
-      </td>
-    </tr>
-
-    <tr class="row">
-      <td colspan="100%">
-        <filed-table :filed="report.filed" v-if="showFiledReports" />
-      </td>
-    </tr>
-  </tbody>
-</template>
-
-<script>
-import FiledTable from '~/components/_new/features/FiledTable/FiledTable'
-import HcUser from '~/components/User/User'
-
-export default {
-  components: {
-    FiledTable,
-    HcUser,
-  },
-  props: {
-    report: {
-      type: Object,
-      required: true,
-    },
-  },
-  data() {
-    return {
-      showFiledReports: false,
-    }
-  },
-  computed: {
-    dataTest() {
-      return `report-${this.report.resource.__typename}`.toLowerCase()
-    },
-    isPost() {
-      return this.report.resource.__typename === 'Post'
-    },
-    isComment() {
-      return this.report.resource.__typename === 'Comment'
-    },
-    isUser() {
-      return this.report.resource.__typename === 'User'
-    },
-    isDisabled() {
-      return this.report.resource.disabled
-    },
-    iconName() {
-      if (this.isPost) return 'bookmark'
-      else if (this.isComment) return 'comments'
-      else if (this.isUser) return 'user'
-      else return null
-    },
-    iconLabel() {
-      if (this.isPost) return this.$t('report.contribution.type')
-      else if (this.isComment) return this.$t('report.comment.type')
-      else if (this.isUser) return this.$t('report.user.type')
-      else return null
-    },
-    linkTarget() {
-      const { id, slug } = this.isComment ? this.report.resource.post : this.report.resource
-      return {
-        name: 'post-id-slug',
-        params: { id, slug },
-        hash: this.isComment ? `#commentId-${this.report.resource.id}` : '',
-      }
-    },
-    linkText() {
-      return (
-        this.report.resource.title || this.$filters.removeHtml(this.report.resource.contentExcerpt)
-      )
-    },
-    statusIconName() {
-      return this.isDisabled ? 'eye-slash' : 'eye'
-    },
-    statusText() {
-      if (!this.report.reviewed) return this.$t('moderation.reports.enabled')
-      else if (this.isDisabled) return this.$t('moderation.reports.disabledBy')
-      else return this.$t('moderation.reports.enabledBy')
-    },
-    moderatorOfLatestReview() {
-      return this.report.reviewed[0].moderator
-    },
-  },
-}
-</script>
-
-<style lang="scss">
-.report-row {
-  &:nth-child(2n + 1) {
-    background-color: $color-neutral-95;
-  }
-
-  .title {
-    font-weight: $font-weight-bold;
-  }
-
-  .status-line {
-    display: inline-flex;
-
-    > .base-icon {
-      margin-right: $space-xx-small;
-    }
-  }
-
-  .user-count {
-    display: block;
-    margin-bottom: $space-xx-small;
-  }
-
-  .--disabled {
-    color: $color-danger;
-  }
-
-  .--enabled {
-    color: $color-success;
-  }
-}
-</style>
diff --git a/webapp/components/_new/features/ReportsTable/ReportsTable.spec.js b/webapp/components/_new/features/ReportsTable/ReportsTable.spec.js
deleted file mode 100644
index cedb01713..000000000
--- a/webapp/components/_new/features/ReportsTable/ReportsTable.spec.js
+++ /dev/null
@@ -1,216 +0,0 @@
-import { config, mount, RouterLinkStub } from '@vue/test-utils'
-import Vuex from 'vuex'
-import ReportsTable from './ReportsTable.vue'
-import { reports } from './ReportsTable.story.js'
-import BaseIcon from '~/components/_new/generic/BaseIcon/BaseIcon'
-
-const localVue = global.localVue
-
-config.stubs['client-only'] = '<span><slot /></span>'
-
-describe('ReportsTable', () => {
-  let propsData, mocks, stubs, getters, wrapper, reportsTable
-
-  beforeEach(() => {
-    propsData = {}
-    mocks = {
-      $t: jest.fn(string => string),
-    }
-    stubs = {
-      NuxtLink: RouterLinkStub,
-    }
-    getters = {
-      'auth/user': () => {
-        return { slug: 'awesome-user' }
-      },
-      'auth/isModerator': () => true,
-    }
-  })
-
-  describe('mount', () => {
-    const Wrapper = () => {
-      const store = new Vuex.Store({
-        getters,
-      })
-      return mount(ReportsTable, { propsData, mocks, stubs, localVue, store })
-    }
-
-    describe('given no reports', () => {
-      beforeEach(() => {
-        propsData = { ...propsData, reports: [] }
-        wrapper = Wrapper()
-      })
-
-      it('shows a placeholder', () => {
-        expect(wrapper.text()).toContain('moderation.reports.empty')
-      })
-    })
-
-    describe('given reports', () => {
-      beforeEach(() => {
-        propsData = { ...propsData, reports }
-        wrapper = Wrapper()
-        reportsTable = wrapper.find('.ds-table')
-      })
-
-      it('renders a table', () => {
-        expect(reportsTable.exists()).toBe(true)
-      })
-
-      describe('Comment', () => {
-        let commentRow
-        beforeEach(() => {
-          commentRow = wrapper.find('[data-test="report-comment"]')
-        })
-
-        it('renders a comments icon', () => {
-          const commentsIcon = commentRow.find(BaseIcon).props().name
-          expect(commentsIcon).toEqual('comments')
-        })
-
-        it('renders a link to the post, with the comment contentExcerpt', () => {
-          const postLink = commentRow.find('[data-test="report-content"] a')
-          expect(postLink.text()).toEqual('@peter-lustig Lorem ipsum dolor sit amet, …')
-        })
-
-        it('renders the author', () => {
-          const username = commentRow.find('[data-test="report-author"] b')
-          expect(username.text()).toEqual('Louie')
-        })
-
-        describe('given it has been reviewed', () => {
-          it('renders the enabled icon', () => {
-            expect(
-              commentRow
-                .find('.status-line')
-                .find(BaseIcon)
-                .props().name,
-            ).toEqual('eye')
-          })
-
-          it('renders its current status', () => {
-            expect(commentRow.find('.status-line').text()).toEqual('moderation.reports.enabledBy')
-          })
-
-          it('renders the moderator who reviewed the resource', () => {
-            const username = commentRow.find('[data-test="report-reviewer"]')
-            expect(username.text()).toContain('@moderator')
-          })
-        })
-
-        describe('give report has not been closed', () => {
-          let confirmButton
-          beforeEach(() => {
-            confirmButton = commentRow.find('[data-test="confirm"]')
-          })
-          it('renders a confirm button', () => {
-            expect(confirmButton.exists()).toBe(true)
-          })
-
-          it('emits confirm event', () => {
-            confirmButton.trigger('click')
-            expect(wrapper.emitted().confirm[0][0]).toEqual(reports[0])
-          })
-        })
-      })
-
-      describe('Post', () => {
-        let postRow
-        beforeEach(() => {
-          postRow = wrapper.find('[data-test="report-post"]')
-        })
-
-        it('renders a bookmark icon', () => {
-          const postIcon = postRow.find(BaseIcon).props().name
-          expect(postIcon).toEqual('bookmark')
-        })
-
-        it('renders a link to the post', () => {
-          const postLink = postRow.find('[data-test="report-content"] a')
-          expect(postLink.text()).toEqual("I'm a bigoted post!")
-        })
-
-        it('renders the author', () => {
-          const username = postRow.find('[data-test="report-author"]')
-          expect(username.text()).toContain('Dagobert')
-        })
-
-        describe('given it has not been reviewed', () => {
-          it('renders the enabled icon', () => {
-            expect(
-              postRow
-                .find('.status-line')
-                .find(BaseIcon)
-                .props().name,
-            ).toEqual('eye')
-          })
-
-          it('renders its current status', () => {
-            expect(postRow.find('.status-line').text()).toEqual('moderation.reports.enabled')
-          })
-        })
-
-        describe('give report has not been closed', () => {
-          let confirmButton
-          beforeEach(() => {
-            confirmButton = postRow.find('[data-test="confirm"]')
-          })
-
-          it('renders a confirm button', () => {
-            expect(confirmButton.exists()).toBe(true)
-          })
-
-          it('emits confirm event', () => {
-            confirmButton.trigger('click')
-            expect(wrapper.emitted().confirm[0][0]).toEqual(reports[1])
-          })
-        })
-      })
-
-      describe('User', () => {
-        let userRow
-        beforeEach(() => {
-          userRow = wrapper.find('[data-test="report-user"]')
-        })
-
-        it('renders a bookmark icon', () => {
-          const userIcon = userRow.find(BaseIcon).props().name
-          expect(userIcon).toEqual('user')
-        })
-
-        it('renders a link to the user profile', () => {
-          const userLink = userRow.find('[data-test="report-content"] a')
-          expect(userLink.text()).toContain('Abusive user')
-        })
-
-        describe('given it has been reviewed', () => {
-          it('renders the disabled icon', () => {
-            expect(
-              userRow
-                .find('.status-line')
-                .find(BaseIcon)
-                .props().name,
-            ).toEqual('eye-slash')
-          })
-
-          it('renders its current status', () => {
-            expect(userRow.find('.status-line').text()).toEqual('moderation.reports.disabledBy')
-          })
-
-          it('renders the moderator who reviewed the resource', () => {
-            const username = userRow.find('[data-test="report-reviewer"]')
-            expect(username.text()).toContain('Peter Lustig')
-          })
-        })
-
-        describe('give report has been closed', () => {
-          it('renders Decided text', () => {
-            expect(userRow.find('[data-test="report-closed"]').text()).toEqual(
-              'moderation.reports.decided',
-            )
-          })
-        })
-      })
-    })
-  })
-})
diff --git a/webapp/components/_new/features/ReportsTable/ReportsTable.story.js b/webapp/components/_new/features/ReportsTable/ReportsTable.story.js
deleted file mode 100644
index 3c7abec5d..000000000
--- a/webapp/components/_new/features/ReportsTable/ReportsTable.story.js
+++ /dev/null
@@ -1,169 +0,0 @@
-import { storiesOf } from '@storybook/vue'
-import { withA11y } from '@storybook/addon-a11y'
-import { action } from '@storybook/addon-actions'
-import ReportsTable from '~/components/_new/features/ReportsTable/ReportsTable'
-import helpers from '~/storybook/helpers'
-import { post } from '~/components/PostCard/PostCard.story.js'
-import { user } from '~/components/User/User.story.js'
-
-helpers.init()
-export const reports = [
-  {
-    __typename: 'Report',
-    closed: false,
-    createdAt: '2019-10-29T15:36:02.106Z',
-    updatedAt: '2019-12-02T15:56:35.651Z',
-    disable: false,
-    filed: [
-      {
-        __typename: 'FILED',
-        createdAt: '2019-12-02T15:56:35.676Z',
-        reasonCategory: 'pornographic_content_links',
-        reasonDescription: 'This comment is porno!!!',
-        submitter: {
-          ...user,
-        },
-      },
-    ],
-    resource: {
-      __typename: 'Comment',
-      id: 'b6b38937-3efc-4d5e-b12c-549e4d6551a5',
-      createdAt: '2019-10-29T15:38:25.184Z',
-      updatedAt: '2019-10-30T15:38:25.184Z',
-      disabled: false,
-      deleted: false,
-      content:
-        '<p><a class="mention" href="/profile/u1" data-mention-id="u1" target="_blank">@peter-lustig</a> </p><p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Turpis egestas pretium aenean pharetra magna ac placerat. Tempor id eu nisl nunc mi ipsum faucibus vitae. Nibh praesent tristique magna sit amet purus gravida quis blandit. Magna eget est lorem ipsum dolor. In fermentum posuere urna nec. Eleifend donec pretium vulputate sapien nec sagittis aliquam. Augue interdum velit euismod in pellentesque. Id diam maecenas ultricies mi eget mauris pharetra. Donec pretium vulputate sapien nec. Dolor morbi non arcu risus quis varius quam quisque. Blandit turpis cursus in hac habitasse. Est ultricies integer quis auctor elit sed vulputate mi sit. Nunc consequat interdum varius sit amet mattis vulputate enim. Semper feugiat nibh sed pulvinar. Eget felis eget nunc lobortis mattis aliquam. Ultrices vitae auctor eu augue. Tellus molestie nunc non blandit massa enim nec dui. Pharetra massa massa ultricies mi quis hendrerit dolor. Nisl suscipit adipiscing bibendum est ultricies integer.</p>',
-      contentExcerpt:
-        '<p><a href="/profile/u1" target="_blank">@peter-lustig</a> </p><p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Turpis egestas pretium aenean pharetra …</p>',
-      post,
-      author: user,
-    },
-    reviewed: [
-      {
-        updatedAt: '2019-10-30T15:38:25.184Z',
-        moderator: {
-          __typename: 'User',
-          ...user,
-          name: 'Moderator',
-          id: 'moderator',
-          slug: 'moderator',
-        },
-      },
-      {
-        updatedAt: '2019-10-29T15:38:25.184Z',
-        moderator: {
-          __typename: 'User',
-          ...user,
-          name: 'Peter Lustig',
-          id: 'u3',
-          slug: 'peter-lustig',
-        },
-      },
-    ],
-  },
-  {
-    __typename: 'Report',
-    closed: false,
-    createdAt: '2019-10-31T15:36:02.106Z',
-    updatedAt: '2019-12-03T15:56:35.651Z',
-    disable: true,
-    filed: [
-      {
-        __typename: 'FILED',
-        createdAt: '2019-10-31T15:36:02.106Z',
-        reasonCategory: 'discrimination_etc',
-        reasonDescription: 'This post is bigoted',
-        submitter: {
-          ...user,
-        },
-      },
-    ],
-    resource: {
-      __typename: 'Post',
-      author: {
-        ...user,
-        id: 'u7',
-        name: 'Dagobert',
-        slug: 'dagobert',
-      },
-      deleted: false,
-      disabled: false,
-      id: 'p2',
-      slug: 'bigoted-post',
-      title: "I'm a bigoted post!",
-    },
-    reviewed: null,
-  },
-  {
-    __typename: 'Report',
-    closed: true,
-    createdAt: '2019-10-30T15:36:02.106Z',
-    updatedAt: '2019-12-01T15:56:35.651Z',
-    disable: true,
-    filed: [
-      {
-        __typename: 'FILED',
-        createdAt: '2019-10-30T15:36:02.106Z',
-        reasonCategory: 'discrimination_etc',
-        reasonDescription: 'this user is attacking me for who I am!',
-        submitter: {
-          ...user,
-        },
-      },
-    ],
-    resource: {
-      __typename: 'User',
-      commentedCount: 0,
-      contributionsCount: 0,
-      deleted: false,
-      disabled: true,
-      followedByCount: 0,
-      id: 'u5',
-      name: 'Abusive user',
-      slug: 'abusive-user',
-    },
-    reviewed: [
-      {
-        updatedAt: '2019-12-01T15:56:35.651Z',
-        moderator: {
-          __typename: 'User',
-          ...user,
-          name: 'Peter Lustig',
-          id: 'u3',
-          slug: 'peter-lustig',
-        },
-      },
-      {
-        updatedAt: '2019-11-30T15:56:35.651Z',
-        moderator: {
-          __typename: 'User',
-          ...user,
-          name: 'Moderator',
-          id: 'moderator',
-          slug: 'moderator',
-        },
-      },
-    ],
-  },
-]
-
-storiesOf('ReportsTable', module)
-  .addDecorator(withA11y)
-  .addDecorator(helpers.layout)
-  .add('with reports', () => ({
-    components: { ReportsTable },
-    store: helpers.store,
-    data: () => ({
-      reports,
-    }),
-    methods: {
-      confirm: action('confirm'),
-    },
-    template: `<reports-table :reports="reports" @confirm="confirm" />`,
-  }))
-  .add('without reports', () => ({
-    components: { ReportsTable },
-    store: helpers.store,
-    template: `<reports-table />`,
-  }))
diff --git a/webapp/components/_new/features/ReportsTable/ReportsTable.vue b/webapp/components/_new/features/ReportsTable/ReportsTable.vue
deleted file mode 100644
index e172b1863..000000000
--- a/webapp/components/_new/features/ReportsTable/ReportsTable.vue
+++ /dev/null
@@ -1,50 +0,0 @@
-<template>
-  <table
-    v-if="reports && reports.length"
-    class="ds-table ds-table-condensed ds-table-bordered reports-table"
-    cellspacing="0"
-    cellpadding="0"
-  >
-    <colgroup>
-      <col width="4%" />
-      <col width="14%" />
-      <col width="36%" />
-      <col width="14%" />
-      <col width="20%" />
-      <col width="12%" />
-    </colgroup>
-    <thead class="ds-table-col ds-table-head-col">
-      <tr valign="top">
-        <th class="ds-table-head-col"></th>
-        <th class="ds-table-head-col">{{ $t('moderation.reports.submitter') }}</th>
-        <th class="ds-table-head-col">{{ $t('moderation.reports.content') }}</th>
-        <th class="ds-table-head-col">{{ $t('moderation.reports.author') }}</th>
-        <th class="ds-table-head-col">{{ $t('moderation.reports.status') }}</th>
-        <th class="ds-table-head-col">{{ $t('moderation.reports.decision') }}</th>
-      </tr>
-    </thead>
-    <template v-for="report in reports">
-      <report-row
-        :key="report.resource.id"
-        :report="report"
-        @confirm-report="$emit('confirm', report)"
-      />
-    </template>
-  </table>
-  <hc-empty v-else icon="alert" :message="$t('moderation.reports.empty')" />
-</template>
-
-<script>
-import HcEmpty from '~/components/Empty/Empty'
-import ReportRow from '~/components/_new/features/ReportRow/ReportRow'
-
-export default {
-  components: {
-    HcEmpty,
-    ReportRow,
-  },
-  props: {
-    reports: { type: Array, default: () => [] },
-  },
-}
-</script>
diff --git a/webapp/pages/moderation/index.vue b/webapp/pages/moderation/index.vue
index 35abcaff7..abf957cac 100644
--- a/webapp/pages/moderation/index.vue
+++ b/webapp/pages/moderation/index.vue
@@ -3,7 +3,7 @@
 </template>
 
 <script>
-import ReportList from '~/components/_new/features/ReportList/ReportList'
+import ReportList from '~/components/features/ReportList/ReportList'
 
 export default {
   components: {

From d0a18fded82fdbc40b395e7793961ccf11aab291 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Wed, 4 Dec 2019 19:39:36 +0100
Subject: [PATCH 169/174] Rename component, add story/specs

---
 .../FiledReportsTable.spec.js                 | 93 +++++++++++++++++++
 .../FiledReportsTable.story.js                | 25 +++++
 .../FiledReportsTable/FiledReportsTable.vue   | 73 +++++++++++++++
 3 files changed, 191 insertions(+)
 create mode 100644 webapp/components/features/FiledReportsTable/FiledReportsTable.spec.js
 create mode 100644 webapp/components/features/FiledReportsTable/FiledReportsTable.story.js
 create mode 100644 webapp/components/features/FiledReportsTable/FiledReportsTable.vue

diff --git a/webapp/components/features/FiledReportsTable/FiledReportsTable.spec.js b/webapp/components/features/FiledReportsTable/FiledReportsTable.spec.js
new file mode 100644
index 000000000..93f48ff9e
--- /dev/null
+++ b/webapp/components/features/FiledReportsTable/FiledReportsTable.spec.js
@@ -0,0 +1,93 @@
+import { config, mount, RouterLinkStub } from '@vue/test-utils'
+import Vuex from 'vuex'
+import FiledReportsTable from './FiledReportsTable'
+import { reports } from '~/components/features/ReportList/ReportList.story.js'
+
+const localVue = global.localVue
+
+localVue.filter('truncate', string => string)
+
+config.stubs['client-only'] = '<span><slot /></span>'
+
+describe('FiledReportsTable.vue', () => {
+  let wrapper, mocks, propsData, stubs, filed
+
+  beforeEach(() => {
+    mocks = {
+      $t: jest.fn(string => string),
+    }
+    stubs = {
+      NuxtLink: RouterLinkStub,
+    }
+    propsData = {}
+  })
+
+  describe('mount', () => {
+    const Wrapper = () => {
+      const store = new Vuex.Store({
+        getters: {
+          'auth/isModerator': () => true,
+          'auth/user': () => {
+            return { id: 'moderator' }
+          },
+        },
+      })
+      return mount(FiledReportsTable, {
+        propsData,
+        mocks,
+        localVue,
+        store,
+        stubs,
+      })
+    }
+
+    beforeEach(() => {
+      wrapper = Wrapper()
+    })
+
+    describe('given reports', () => {
+      beforeEach(() => {
+        filed = reports.map(report => report.filed)
+        propsData.filed = filed[0]
+        wrapper = Wrapper()
+      })
+
+      it('renders a table', () => {
+        expect(wrapper.find('.ds-table').exists()).toBe(true)
+      })
+
+      it('has 4 columns', () => {
+        expect(wrapper.findAll('.ds-table-col')).toHaveLength(4)
+      })
+
+      describe('FiledReport', () => {
+        it('renders the reporting user', () => {
+          const userSlug = wrapper.find('[data-test="filing-user"]')
+          expect(userSlug.text()).toContain('@community-moderator')
+        })
+
+        it('renders the reported date', () => {
+          const date = wrapper.find('[data-test="filed-date"]')
+          expect(date.text()).toEqual('10/02/2019')
+        })
+
+        it('renders the category text', () => {
+          const columns = wrapper.findAll('.ds-table-col')
+          const reasonCategory = columns.filter(
+            category =>
+              category.text() === 'report.reason.category.options.pornographic_content_links',
+          )
+          expect(reasonCategory.exists()).toBe(true)
+        })
+
+        it("renders the Post's content", () => {
+          const columns = wrapper.findAll('.ds-table-col')
+          const reasonDescription = columns.filter(
+            column => column.text() === 'This comment is porno!!!',
+          )
+          expect(reasonDescription.exists()).toBe(true)
+        })
+      })
+    })
+  })
+})
diff --git a/webapp/components/features/FiledReportsTable/FiledReportsTable.story.js b/webapp/components/features/FiledReportsTable/FiledReportsTable.story.js
new file mode 100644
index 000000000..ec17b06e3
--- /dev/null
+++ b/webapp/components/features/FiledReportsTable/FiledReportsTable.story.js
@@ -0,0 +1,25 @@
+import { storiesOf } from '@storybook/vue'
+import { withA11y } from '@storybook/addon-a11y'
+import FiledReportsTable from '~/components/features/FiledReportsTable/FiledReportsTable'
+import helpers from '~/storybook/helpers'
+import { reports } from '~/components/features/ReportList/ReportList.story.js'
+
+storiesOf('FiledReportsTable', module)
+  .addDecorator(withA11y)
+  .addDecorator(helpers.layout)
+  .add('with filed reports', () => ({
+    components: { FiledReportsTable },
+    store: helpers.store,
+    data: () => ({
+      filed: reports[0].filed,
+    }),
+    template: `<table>
+                <tbody class="report-row">
+                  <tr class="row">
+                    <td colspan="100%">
+                      <filed-reports-table :filed="filed" />
+                    </td>
+                  </tr>
+                </tbody>
+              </table>`,
+  }))
diff --git a/webapp/components/features/FiledReportsTable/FiledReportsTable.vue b/webapp/components/features/FiledReportsTable/FiledReportsTable.vue
new file mode 100644
index 000000000..d54d1116e
--- /dev/null
+++ b/webapp/components/features/FiledReportsTable/FiledReportsTable.vue
@@ -0,0 +1,73 @@
+<template>
+  <ds-table
+    class="nested-table"
+    v-if="filed && filed.length"
+    :data="filed"
+    :fields="fields"
+    condensed
+  >
+    <template #submitter="scope">
+      <hc-user
+        :user="scope.row.submitter"
+        :showAvatar="false"
+        :trunc="30"
+        data-test="filing-user"
+      />
+    </template>
+    <template #reportedOn="scope">
+      <ds-text size="small">
+        <hc-relative-date-time :date-time="scope.row.createdAt" data-test="filed-date" />
+      </ds-text>
+    </template>
+    <template #reasonCategory="scope">
+      {{ $t('report.reason.category.options.' + scope.row.reasonCategory) }}
+    </template>
+    <template #reasonDescription="scope">
+      {{ scope.row.reasonDescription.length ? scope.row.reasonDescription : '—' }}
+    </template>
+  </ds-table>
+</template>
+<script>
+import HcUser from '~/components/User/User'
+import HcRelativeDateTime from '~/components/RelativeDateTime'
+
+export default {
+  components: {
+    HcUser,
+    HcRelativeDateTime,
+  },
+  props: {
+    filed: { type: Array, default: () => [] },
+  },
+  computed: {
+    fields() {
+      return {
+        submitter: {
+          label: this.$t('moderation.reports.submitter'),
+          width: '15%',
+        },
+        reportedOn: {
+          label: this.$t('moderation.reports.reportedOn'),
+          width: '20%',
+        },
+        reasonCategory: {
+          label: this.$t('moderation.reports.reasonCategory'),
+          width: '30%',
+        },
+        reasonDescription: {
+          label: this.$t('moderation.reports.reasonDescription'),
+          width: '35%',
+        },
+      }
+    },
+  },
+}
+</script>
+
+<style lang="scss">
+.nested-table {
+  padding: $space-small;
+  border-top: $border-size-base solid $color-neutral-60;
+  border-bottom: $border-size-base solid $color-neutral-60;
+}
+</style>

From a59e72d8a8f491cb251e3e5acddea3b32144209b Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Wed, 4 Dec 2019 19:40:08 +0100
Subject: [PATCH 170/174] Add stories/specs for ReportList

---
 .../features/ReportList/ReportList.spec.js    |  77 +++++++
 .../features/ReportList/ReportList.story.js   | 193 ++++++++++++++++++
 .../features/ReportList/ReportList.vue        | 142 +++++++++++++
 3 files changed, 412 insertions(+)
 create mode 100644 webapp/components/features/ReportList/ReportList.spec.js
 create mode 100644 webapp/components/features/ReportList/ReportList.story.js
 create mode 100644 webapp/components/features/ReportList/ReportList.vue

diff --git a/webapp/components/features/ReportList/ReportList.spec.js b/webapp/components/features/ReportList/ReportList.spec.js
new file mode 100644
index 000000000..cfd83b4a6
--- /dev/null
+++ b/webapp/components/features/ReportList/ReportList.spec.js
@@ -0,0 +1,77 @@
+import { config, mount } from '@vue/test-utils'
+import Vuex from 'vuex'
+import ReportList from './ReportList'
+import { reports } from './ReportList.story'
+import ReportsTable from '~/components/features/ReportsTable/ReportsTable'
+import DropdownFilter from '~/components/DropdownFilter/DropdownFilter'
+
+const localVue = global.localVue
+
+config.stubs['client-only'] = '<span><slot /></span>'
+config.stubs['nuxt-link'] = '<span><slot /></span>'
+
+describe('ReportList', () => {
+  let mocks, mutations, getters, wrapper
+
+  beforeEach(() => {
+    mocks = {
+      $apollo: {
+        mutate: jest
+          .fn()
+          .mockResolvedValueOnce({
+            data: { review: { disable: true, resourceId: 'some-resource', closed: true } },
+          })
+          .mockRejectedValue({ message: 'Unable to review' }),
+      },
+      $t: jest.fn(),
+      $toast: {
+        error: jest.fn(message => message),
+      },
+    }
+    mutations = {
+      'modal/SET_OPEN': jest.fn().mockResolvedValueOnce(),
+    }
+    getters = {
+      'auth/user': () => {
+        return { slug: 'awesome-user' }
+      },
+      'auth/isModerator': () => true,
+    }
+  })
+
+  describe('mount', () => {
+    const Wrapper = () => {
+      const store = new Vuex.Store({
+        mutations,
+        getters,
+      })
+      return mount(ReportList, { mocks, localVue, store })
+    }
+
+    describe('renders children components', () => {
+      beforeEach(async () => {
+        wrapper = Wrapper()
+      })
+
+      it('renders DropdownFilter', () => {
+        expect(wrapper.find(DropdownFilter).exists()).toBe(true)
+      })
+
+      it('renders ReportsTable', () => {
+        expect(wrapper.find(ReportsTable).exists()).toBe(true)
+      })
+    })
+
+    describe('confirm is emitted by reports table', () => {
+      beforeEach(async () => {
+        wrapper = Wrapper()
+        wrapper.setData({ reports })
+        wrapper.find(ReportsTable).vm.$emit('confirm', reports[0])
+      })
+
+      it('calls modal/SET_OPEN', () => {
+        expect(mutations['modal/SET_OPEN']).toHaveBeenCalledTimes(1)
+      })
+    })
+  })
+})
diff --git a/webapp/components/features/ReportList/ReportList.story.js b/webapp/components/features/ReportList/ReportList.story.js
new file mode 100644
index 000000000..e126f1e64
--- /dev/null
+++ b/webapp/components/features/ReportList/ReportList.story.js
@@ -0,0 +1,193 @@
+import { storiesOf } from '@storybook/vue'
+import { withA11y } from '@storybook/addon-a11y'
+import { action } from '@storybook/addon-actions'
+import { post } from '~/components/PostCard/PostCard.story.js'
+import { user } from '~/components/User/User.story.js'
+import helpers from '~/storybook/helpers'
+import ReportList from './ReportList'
+import DropdownFilter from '~/components/DropdownFilter/DropdownFilter'
+import ReportsTable from '~/components/features/ReportsTable/ReportsTable'
+helpers.init()
+
+export const reports = [
+  {
+    __typename: 'Report',
+    closed: false,
+    createdAt: '2019-10-29T15:36:02.106Z',
+    updatedAt: '2019-12-02T15:56:35.651Z',
+    disable: false,
+    filed: [
+      {
+        __typename: 'FILED',
+        createdAt: '2019-10-02T15:56:35.676Z',
+        reasonCategory: 'pornographic_content_links',
+        reasonDescription: 'This comment is porno!!!',
+        submitter: {
+          ...user,
+          name: 'Community moderator',
+          id: 'community-moderator',
+          slug: 'community-moderator',
+        },
+      },
+    ],
+    resource: {
+      __typename: 'Comment',
+      id: 'b6b38937-3efc-4d5e-b12c-549e4d6551a5',
+      createdAt: '2019-10-29T15:38:25.184Z',
+      updatedAt: '2019-10-30T15:38:25.184Z',
+      disabled: false,
+      deleted: false,
+      content:
+        '<p><a class="mention" href="/profile/u1" data-mention-id="u1" target="_blank">@peter-lustig</a> </p><p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Turpis egestas pretium aenean pharetra magna ac placerat. Tempor id eu nisl nunc mi ipsum faucibus vitae. Nibh praesent tristique magna sit amet purus gravida quis blandit. Magna eget est lorem ipsum dolor. In fermentum posuere urna nec. Eleifend donec pretium vulputate sapien nec sagittis aliquam. Augue interdum velit euismod in pellentesque. Id diam maecenas ultricies mi eget mauris pharetra. Donec pretium vulputate sapien nec. Dolor morbi non arcu risus quis varius quam quisque. Blandit turpis cursus in hac habitasse. Est ultricies integer quis auctor elit sed vulputate mi sit. Nunc consequat interdum varius sit amet mattis vulputate enim. Semper feugiat nibh sed pulvinar. Eget felis eget nunc lobortis mattis aliquam. Ultrices vitae auctor eu augue. Tellus molestie nunc non blandit massa enim nec dui. Pharetra massa massa ultricies mi quis hendrerit dolor. Nisl suscipit adipiscing bibendum est ultricies integer.</p>',
+      contentExcerpt:
+        '<p><a href="/profile/u1" target="_blank">@peter-lustig</a> </p><p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Turpis egestas pretium aenean pharetra …</p>',
+      post,
+      author: user,
+    },
+    reviewed: [
+      {
+        updatedAt: '2019-10-30T15:38:25.184Z',
+        moderator: {
+          __typename: 'User',
+          ...user,
+          name: 'Moderator',
+          id: 'moderator',
+          slug: 'moderator',
+        },
+      },
+      {
+        updatedAt: '2019-10-29T15:38:25.184Z',
+        moderator: {
+          __typename: 'User',
+          ...user,
+          name: 'Peter Lustig',
+          id: 'u3',
+          slug: 'peter-lustig',
+        },
+      },
+    ],
+  },
+  {
+    __typename: 'Report',
+    closed: false,
+    createdAt: '2019-10-31T15:36:02.106Z',
+    updatedAt: '2019-12-03T15:56:35.651Z',
+    disable: true,
+    filed: [
+      {
+        __typename: 'FILED',
+        createdAt: '2019-10-31T15:36:02.106Z',
+        reasonCategory: 'discrimination_etc',
+        reasonDescription: 'This post is bigoted',
+        submitter: {
+          ...user,
+          name: 'Modertation team',
+          id: 'moderation-team',
+          slug: 'moderation-team',
+        },
+      },
+    ],
+    resource: {
+      __typename: 'Post',
+      author: {
+        ...user,
+        id: 'u7',
+        name: 'Dagobert',
+        slug: 'dagobert',
+      },
+      deleted: false,
+      disabled: false,
+      id: 'p2',
+      slug: 'bigoted-post',
+      title: "I'm a bigoted post!",
+    },
+    reviewed: null,
+  },
+  {
+    __typename: 'Report',
+    closed: true,
+    createdAt: '2019-10-30T15:36:02.106Z',
+    updatedAt: '2019-12-01T15:56:35.651Z',
+    disable: true,
+    filed: [
+      {
+        __typename: 'FILED',
+        createdAt: '2019-10-30T15:36:02.106Z',
+        reasonCategory: 'discrimination_etc',
+        reasonDescription: 'this user is attacking me for who I am!',
+        submitter: {
+          ...user,
+          name: 'Helpful user',
+          id: 'helpful-user',
+          slug: 'helpful-user',
+        },
+      },
+    ],
+    resource: {
+      __typename: 'User',
+      commentedCount: 0,
+      contributionsCount: 0,
+      deleted: false,
+      disabled: true,
+      followedByCount: 0,
+      id: 'u5',
+      name: 'Abusive user',
+      slug: 'abusive-user',
+    },
+    reviewed: [
+      {
+        updatedAt: '2019-12-01T15:56:35.651Z',
+        moderator: {
+          __typename: 'User',
+          ...user,
+          name: 'Peter Lustig',
+          id: 'u3',
+          slug: 'peter-lustig',
+        },
+      },
+      {
+        updatedAt: '2019-11-30T15:56:35.651Z',
+        moderator: {
+          __typename: 'User',
+          ...user,
+          name: 'Moderator',
+          id: 'moderator',
+          slug: 'moderator',
+        },
+      },
+    ],
+  },
+]
+const unreviewedReports = reports.filter(report => !report.reviewed)
+const reviewedReports = reports.filter(report => report.reviewed)
+const closedReports = reports.filter(report => report.closed)
+const filterOptions = [
+  { label: 'All', value: reports },
+  { label: 'Unreviewed', value: unreviewedReports },
+  { label: 'Reviewed', value: reviewedReports },
+  { label: 'Closed', value: closedReports },
+]
+
+storiesOf('ReportList', module)
+  .addDecorator(withA11y)
+  .addDecorator(helpers.layout)
+  .add('with reports', () => ({
+    components: { ReportList, DropdownFilter, ReportsTable },
+    store: helpers.store,
+    data: () => ({
+      filterOptions,
+      selected: filterOptions[0].label,
+      reports,
+    }),
+    methods: {
+      openModal: action('openModal'),
+      filter: action('filter'),
+    },
+    template: `<ds-card>
+                <div class="reports-header">
+                  <h3 class="title">Reports</h3>
+                  <dropdown-filter @filter="filter" :filterOptions="filterOptions" :selected="selected" />
+                </div>
+                <reports-table :reports="reports" @confirm="openModal" />
+              </ds-card>`,
+  }))
diff --git a/webapp/components/features/ReportList/ReportList.vue b/webapp/components/features/ReportList/ReportList.vue
new file mode 100644
index 000000000..85b74d7cc
--- /dev/null
+++ b/webapp/components/features/ReportList/ReportList.vue
@@ -0,0 +1,142 @@
+<template>
+  <ds-card>
+    <div class="reports-header">
+      <h3 class="title">{{ $t('moderation.reports.name') }}</h3>
+      <client-only>
+        <dropdown-filter @filter="filter" :filterOptions="filterOptions" :selected="selected" />
+      </client-only>
+    </div>
+    <reports-table :reports="reports" @confirm="openModal" />
+  </ds-card>
+</template>
+<script>
+import { mapMutations } from 'vuex'
+import DropdownFilter from '~/components/DropdownFilter/DropdownFilter'
+import ReportsTable from '~/components/features/ReportsTable/ReportsTable'
+import { reportsListQuery, reviewMutation } from '~/graphql/Moderation.js'
+
+export default {
+  components: {
+    DropdownFilter,
+    ReportsTable,
+  },
+  data() {
+    return {
+      reports: [],
+      allReports: [],
+      unreviewedReports: [],
+      reviewedReports: [],
+      closedReports: [],
+      selected: this.$t('moderation.reports.filterLabel.all'),
+    }
+  },
+  computed: {
+    filterOptions() {
+      return [
+        { label: this.$t('moderation.reports.filterLabel.all'), value: this.allReports },
+        {
+          label: this.$t('moderation.reports.filterLabel.unreviewed'),
+          value: this.unreviewedReports,
+        },
+        { label: this.$t('moderation.reports.filterLabel.reviewed'), value: this.reviewedReports },
+        { label: this.$t('moderation.reports.filterLabel.closed'), value: this.closedReports },
+      ]
+    },
+    modalData() {
+      return function(report) {
+        const identStart =
+          'moderation.reports.decideModal.' +
+          report.resource.__typename +
+          '.' +
+          (report.resource.disabled ? 'disable' : 'enable')
+        return {
+          name: 'confirm',
+          data: {
+            type: report.resource.__typename,
+            resource: report.resource,
+            modalData: {
+              titleIdent: identStart + '.title',
+              messageIdent: identStart + '.message',
+              messageParams: {
+                name:
+                  report.resource.name ||
+                  this.$filters.truncate(report.resource.title, 30) ||
+                  this.$filters.truncate(
+                    this.$filters.removeHtml(report.resource.contentExcerpt),
+                    30,
+                  ),
+              },
+              buttons: {
+                confirm: {
+                  danger: true,
+                  icon: report.resource.disabled ? 'eye-slash' : 'eye',
+                  textIdent: 'moderation.reports.decideModal.submit',
+                  callback: () => {
+                    this.confirmCallback(report.resource)
+                  },
+                },
+                cancel: {
+                  icon: 'close',
+                  textIdent: 'moderation.reports.decideModal.cancel',
+                  callback: () => {},
+                },
+              },
+            },
+          },
+        }
+      }
+    },
+  },
+  methods: {
+    ...mapMutations({
+      commitModalData: 'modal/SET_OPEN',
+    }),
+    filter(option) {
+      this.reports = option.value
+      this.selected = option.label
+    },
+    async confirmCallback(resource) {
+      const { disabled: disable, id: resourceId } = resource
+      this.$apollo
+        .mutate({
+          mutation: reviewMutation(),
+          variables: { disable, resourceId, closed: true },
+        })
+        .then(() => {
+          this.$toast.success(this.$t('moderation.reports.DecisionSuccess'))
+          this.$apollo.queries.reportsList.refetch()
+        })
+        .catch(error => this.$toast.error(error.message))
+    },
+    openModal(report) {
+      this.commitModalData(this.modalData(report))
+    },
+  },
+  apollo: {
+    reportsList: {
+      query: reportsListQuery(),
+      update({ reports }) {
+        this.reports = reports
+        this.allReports = reports
+        this.unreviewedReports = reports.filter(report => !report.reviewed)
+        this.reviewedReports = reports.filter(report => report.reviewed)
+        this.closedReports = reports.filter(report => report.closed)
+      },
+      fetchPolicy: 'cache-and-network',
+    },
+  },
+}
+</script>
+
+<style lang="scss">
+.reports-header {
+  display: flex;
+  justify-content: space-between;
+  margin: $space-small 0;
+
+  > .title {
+    margin: 0;
+    font-size: $font-size-large;
+  }
+}
+</style>

From fe63e42262e052ed8d024e43edf61947552c8028 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Wed, 4 Dec 2019 19:40:32 +0100
Subject: [PATCH 171/174] Refactor component/story/test

- Remove data-test where not necessary
- Refactor tests to remove tests that belong in ReportRow
- Fix story
---
 .../ReportsTable/ReportsTable.spec.js         | 62 +++++++++++++++++++
 .../ReportsTable/ReportsTable.story.js        | 28 +++++++++
 .../features/ReportsTable/ReportsTable.vue    | 50 +++++++++++++++
 3 files changed, 140 insertions(+)
 create mode 100644 webapp/components/features/ReportsTable/ReportsTable.spec.js
 create mode 100644 webapp/components/features/ReportsTable/ReportsTable.story.js
 create mode 100644 webapp/components/features/ReportsTable/ReportsTable.vue

diff --git a/webapp/components/features/ReportsTable/ReportsTable.spec.js b/webapp/components/features/ReportsTable/ReportsTable.spec.js
new file mode 100644
index 000000000..0aa80b492
--- /dev/null
+++ b/webapp/components/features/ReportsTable/ReportsTable.spec.js
@@ -0,0 +1,62 @@
+import { config, mount } from '@vue/test-utils'
+import Vuex from 'vuex'
+import ReportsTable from './ReportsTable.vue'
+import { reports } from '~/components/features/ReportsList/ReportsList.story.js'
+
+const localVue = global.localVue
+
+config.stubs['client-only'] = '<span><slot /></span>'
+config.stubs['nuxt-link'] = '<span><slot /></span>'
+
+describe('ReportsTable', () => {
+  let propsData, mocks, getters, wrapper, reportsTable
+
+  beforeEach(() => {
+    propsData = {}
+    mocks = {
+      $t: jest.fn(string => string),
+    }
+    getters = {
+      'auth/user': () => {
+        return { slug: 'awesome-user' }
+      },
+      'auth/isModerator': () => true,
+    }
+  })
+
+  describe('mount', () => {
+    const Wrapper = () => {
+      const store = new Vuex.Store({
+        getters,
+      })
+      return mount(ReportsTable, { propsData, mocks, localVue, store })
+    }
+
+    describe('given no reports', () => {
+      beforeEach(() => {
+        propsData = { ...propsData, reports: [] }
+        wrapper = Wrapper()
+      })
+
+      it('shows a placeholder', () => {
+        expect(wrapper.text()).toContain('moderation.reports.empty')
+      })
+    })
+
+    describe('given reports', () => {
+      beforeEach(() => {
+        propsData = { ...propsData, reports }
+        wrapper = Wrapper()
+        reportsTable = wrapper.find('.ds-table')
+      })
+
+      it('renders a table', () => {
+        expect(reportsTable.exists()).toBe(true)
+      })
+
+      it('renders at least one ReportRow component', () => {
+        expect(wrapper.find('.report-row').exists()).toBe(true)
+      })
+    })
+  })
+})
diff --git a/webapp/components/features/ReportsTable/ReportsTable.story.js b/webapp/components/features/ReportsTable/ReportsTable.story.js
new file mode 100644
index 000000000..1326b6c37
--- /dev/null
+++ b/webapp/components/features/ReportsTable/ReportsTable.story.js
@@ -0,0 +1,28 @@
+import { storiesOf } from '@storybook/vue'
+import { withA11y } from '@storybook/addon-a11y'
+import { action } from '@storybook/addon-actions'
+import ReportsTable from '~/components/features/ReportsTable/ReportsTable'
+import helpers from '~/storybook/helpers'
+import { reports } from '~/components/features/ReportList/ReportList.story.js'
+
+helpers.init()
+
+storiesOf('ReportsTable', module)
+  .addDecorator(withA11y)
+  .addDecorator(helpers.layout)
+  .add('with reports', () => ({
+    components: { ReportsTable },
+    store: helpers.store,
+    data: () => ({
+      reports,
+    }),
+    methods: {
+      confirm: action('confirm'),
+    },
+    template: `<reports-table :reports="reports" @confirm="confirm" />`,
+  }))
+  .add('without reports', () => ({
+    components: { ReportsTable },
+    store: helpers.store,
+    template: `<reports-table />`,
+  }))
diff --git a/webapp/components/features/ReportsTable/ReportsTable.vue b/webapp/components/features/ReportsTable/ReportsTable.vue
new file mode 100644
index 000000000..512c04ea8
--- /dev/null
+++ b/webapp/components/features/ReportsTable/ReportsTable.vue
@@ -0,0 +1,50 @@
+<template>
+  <table
+    v-if="reports && reports.length"
+    class="ds-table ds-table-condensed ds-table-bordered reports-table"
+    cellspacing="0"
+    cellpadding="0"
+  >
+    <colgroup>
+      <col width="4%" />
+      <col width="14%" />
+      <col width="36%" />
+      <col width="14%" />
+      <col width="20%" />
+      <col width="12%" />
+    </colgroup>
+    <thead class="ds-table-col ds-table-head-col">
+      <tr valign="top">
+        <th class="ds-table-head-col"></th>
+        <th class="ds-table-head-col">{{ $t('moderation.reports.submitter') }}</th>
+        <th class="ds-table-head-col">{{ $t('moderation.reports.content') }}</th>
+        <th class="ds-table-head-col">{{ $t('moderation.reports.author') }}</th>
+        <th class="ds-table-head-col">{{ $t('moderation.reports.status') }}</th>
+        <th class="ds-table-head-col">{{ $t('moderation.reports.decision') }}</th>
+      </tr>
+    </thead>
+    <template v-for="report in reports">
+      <report-row
+        :key="report.resource.id"
+        :report="report"
+        @confirm-report="$emit('confirm', report)"
+      />
+    </template>
+  </table>
+  <hc-empty v-else icon="alert" :message="$t('moderation.reports.empty')" />
+</template>
+
+<script>
+import HcEmpty from '~/components/Empty/Empty'
+import ReportRow from '~/components/features/ReportRow/ReportRow'
+
+export default {
+  components: {
+    HcEmpty,
+    ReportRow,
+  },
+  props: {
+    reports: { type: Array, default: () => [] },
+  },
+}
+</script>

From 7becb09ef7cc8f09893a056dcd06a96f59f1239f Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Wed, 4 Dec 2019 19:41:58 +0100
Subject: [PATCH 172/174] Add tests/Refactor

- Move tests which are not resource specific to own describe block, add
test cases
---
 .../features/ReportRow/ReportRow.spec.js      | 187 ++++++++++++++++++
 .../features/ReportRow/ReportRow.vue          | 183 +++++++++++++++++
 2 files changed, 370 insertions(+)
 create mode 100644 webapp/components/features/ReportRow/ReportRow.spec.js
 create mode 100644 webapp/components/features/ReportRow/ReportRow.vue

diff --git a/webapp/components/features/ReportRow/ReportRow.spec.js b/webapp/components/features/ReportRow/ReportRow.spec.js
new file mode 100644
index 000000000..ff0d51f5f
--- /dev/null
+++ b/webapp/components/features/ReportRow/ReportRow.spec.js
@@ -0,0 +1,187 @@
+import { config, mount, RouterLinkStub } from '@vue/test-utils'
+import Vuex from 'vuex'
+import ReportRow from './ReportRow.vue'
+import BaseIcon from '~/components/_new/generic/BaseIcon/BaseIcon'
+import { reports } from '~/components/features/ReportsList/ReportsList.story.js'
+
+const localVue = global.localVue
+
+config.stubs['client-only'] = '<span><slot /></span>'
+
+describe('ReportRow', () => {
+  let propsData, mocks, stubs, getters, wrapper
+
+  beforeEach(() => {
+    propsData = {}
+    mocks = {
+      $t: jest.fn(string => string),
+    }
+    stubs = {
+      NuxtLink: RouterLinkStub,
+    }
+    getters = {
+      'auth/user': () => {
+        return { slug: 'awesome-user' }
+      },
+      'auth/isModerator': () => true,
+    }
+  })
+
+  describe('given a report ', () => {
+    const Wrapper = () => {
+      const store = new Vuex.Store({
+        getters,
+      })
+      return mount(ReportRow, { propsData, mocks, stubs, localVue, store })
+    }
+
+    describe('has not been closed', () => {
+      let confirmButton
+      beforeEach(() => {
+        propsData = { ...propsData, report: reports[1] }
+        wrapper = Wrapper()
+        confirmButton = wrapper.find('.ds-button-danger')
+      })
+
+      it('renders a confirm button', () => {
+        expect(confirmButton.exists()).toBe(true)
+      })
+
+      it('emits confirm event', () => {
+        confirmButton.trigger('click')
+        expect(wrapper.emitted('confirm-report')).toHaveLength(1)
+      })
+    })
+
+    describe('has been closed', () => {
+      beforeEach(() => {
+        propsData = { ...propsData, report: reports[2] }
+        wrapper = Wrapper()
+      })
+
+      it('renders a decided text', () => {
+        const decidedTitle = wrapper
+          .findAll('.title')
+          .filter(title => title.text() === 'moderation.reports.decided')
+        expect(decidedTitle.exists()).toBe(true)
+      })
+    })
+
+    describe('has not been reviewed', () => {
+      beforeEach(() => {
+        propsData = { ...propsData, report: reports[1] }
+        wrapper = Wrapper()
+      })
+
+      it('renders its current status', () => {
+        expect(wrapper.find('.status-line').text()).toEqual('moderation.reports.enabled')
+      })
+    })
+
+    describe('has been reviewed', () => {
+      describe('and disabled', () => {
+        beforeEach(() => {
+          propsData = { ...propsData, report: reports[2] }
+          wrapper = Wrapper()
+        })
+        it('renders the disabled icon', () => {
+          expect(
+            wrapper
+              .find('.status-line')
+              .find(BaseIcon)
+              .props().name,
+          ).toEqual('eye-slash')
+        })
+
+        it('renders its current status', () => {
+          expect(wrapper.find('.status-line').text()).toEqual('moderation.reports.disabledBy')
+        })
+      })
+
+      describe('and enabled', () => {
+        beforeEach(() => {
+          propsData = { ...propsData, report: reports[0] }
+          wrapper = Wrapper()
+        })
+        it('renders the enabled icon', () => {
+          expect(
+            wrapper
+              .find('.status-line')
+              .find(BaseIcon)
+              .props().name,
+          ).toEqual('eye')
+        })
+
+        it('renders its current status', () => {
+          expect(wrapper.find('.status-line').text()).toEqual('moderation.reports.enabledBy')
+        })
+
+        it('renders the moderator who reviewed the resource', () => {
+          const username = wrapper.find('[data-test="report-reviewer"]')
+          expect(username.text()).toContain('@moderator')
+        })
+      })
+    })
+
+    describe('concerns a Comment', () => {
+      beforeEach(() => {
+        propsData = { ...propsData, report: reports[0] }
+        wrapper = Wrapper()
+      })
+
+      it('renders a comments icon', () => {
+        const commentsIcon = wrapper.find(BaseIcon).props().name
+        expect(commentsIcon).toEqual('comments')
+      })
+
+      it('renders a link to the post, with the comment contentExcerpt', () => {
+        const postLink = wrapper.find('.title')
+        expect(postLink.text()).toEqual('@peter-lustig Lorem ipsum dolor sit amet, …')
+      })
+
+      it('renders the author', () => {
+        const userSlug = wrapper.find('[data-test="report-author"]')
+        expect(userSlug.text()).toContain('@louie')
+      })
+    })
+
+    describe('concerns a Post', () => {
+      beforeEach(() => {
+        propsData = { ...propsData, report: reports[1] }
+        wrapper = Wrapper()
+      })
+
+      it('renders a bookmark icon', () => {
+        const postIcon = wrapper.find(BaseIcon).props().name
+        expect(postIcon).toEqual('bookmark')
+      })
+
+      it('renders a link to the post', () => {
+        const postLink = wrapper.find('.title')
+        expect(postLink.text()).toEqual("I'm a bigoted post!")
+      })
+
+      it('renders the author', () => {
+        const username = wrapper.find('[data-test="report-author"]')
+        expect(username.text()).toContain('@dagobert')
+      })
+    })
+
+    describe('concerns a User', () => {
+      beforeEach(() => {
+        propsData = { ...propsData, report: reports[2] }
+        wrapper = Wrapper()
+      })
+
+      it('renders a user icon', () => {
+        const userIcon = wrapper.find(BaseIcon).props().name
+        expect(userIcon).toEqual('user')
+      })
+
+      it('renders a link to the user profile', () => {
+        const userLink = wrapper.find('[data-test="report-content"]')
+        expect(userLink.text()).toContain('@abusive-user')
+      })
+    })
+  })
+})
diff --git a/webapp/components/features/ReportRow/ReportRow.vue b/webapp/components/features/ReportRow/ReportRow.vue
new file mode 100644
index 000000000..cc81ae018
--- /dev/null
+++ b/webapp/components/features/ReportRow/ReportRow.vue
@@ -0,0 +1,183 @@
+<template>
+  <tbody class="report-row">
+    <tr>
+      <!-- Icon Column -->
+      <td class="ds-table-col">
+        <base-icon :name="iconName" :title="iconLabel" />
+      </td>
+
+      <!-- Number of Filed Reports Column -->
+      <td class="ds-table-col">
+        <span class="user-count">
+          {{ $t('moderation.reports.numberOfUsers', { count: report.filed.length }) }}
+        </span>
+        <ds-button size="small" @click="showFiledReports = !showFiledReports">
+          {{ $t('moderation.reports.moreDetails') }}
+        </ds-button>
+      </td>
+
+      <!-- Content Column -->
+      <td class="ds-table-col" data-test="report-content">
+        <client-only v-if="isUser">
+          <hc-user :user="report.resource" :showAvatar="false" :trunc="30" />
+        </client-only>
+        <nuxt-link v-else class="title" :to="linkTarget">
+          {{ linkText | truncate(50) }}
+        </nuxt-link>
+      </td>
+
+      <!-- Author Column -->
+      <td class="ds-table-col" data-test="report-author">
+        <client-only v-if="!isUser">
+          <hc-user :user="report.resource.author" :showAvatar="false" :trunc="30" />
+        </client-only>
+        <span v-else>—</span>
+      </td>
+
+      <!-- Status Column -->
+      <td class="ds-table-col" data-test="report-reviewer">
+        <span class="status-line">
+          <base-icon :name="statusIconName" :class="isDisabled ? '--disabled' : '--enabled'" />
+          {{ statusText }}
+        </span>
+        <client-only v-if="report.reviewed">
+          <hc-user
+            :user="moderatorOfLatestReview"
+            :showAvatar="false"
+            :trunc="30"
+            :date-time="report.updatedAt"
+          />
+        </client-only>
+      </td>
+
+      <!-- Decision Column -->
+      <td class="ds-table-col">
+        <span v-if="report.closed" class="title">
+          {{ $t('moderation.reports.decided') }}
+        </span>
+        <ds-button
+          v-else
+          danger
+          data-test="confirm"
+          size="small"
+          :icon="statusIconName"
+          @click="$emit('confirm-report')"
+        >
+          {{ $t('moderation.reports.decideButton') }}
+        </ds-button>
+      </td>
+    </tr>
+
+    <tr class="row">
+      <td colspan="100%">
+        <filed-reports-table :filed="report.filed" v-if="showFiledReports" />
+      </td>
+    </tr>
+  </tbody>
+</template>
+
+<script>
+import FiledReportsTable from '~/components/features/FiledReportsTable/FiledReportsTable'
+import HcUser from '~/components/User/User'
+
+export default {
+  components: {
+    FiledReportsTable,
+    HcUser,
+  },
+  props: {
+    report: {
+      type: Object,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      showFiledReports: false,
+    }
+  },
+  computed: {
+    isPost() {
+      return this.report.resource.__typename === 'Post'
+    },
+    isComment() {
+      return this.report.resource.__typename === 'Comment'
+    },
+    isUser() {
+      return this.report.resource.__typename === 'User'
+    },
+    isDisabled() {
+      return this.report.resource.disabled
+    },
+    iconName() {
+      if (this.isPost) return 'bookmark'
+      else if (this.isComment) return 'comments'
+      else if (this.isUser) return 'user'
+      else return null
+    },
+    iconLabel() {
+      if (this.isPost) return this.$t('report.contribution.type')
+      else if (this.isComment) return this.$t('report.comment.type')
+      else if (this.isUser) return this.$t('report.user.type')
+      else return null
+    },
+    linkTarget() {
+      const { id, slug } = this.isComment ? this.report.resource.post : this.report.resource
+      return {
+        name: 'post-id-slug',
+        params: { id, slug },
+        hash: this.isComment ? `#commentId-${this.report.resource.id}` : '',
+      }
+    },
+    linkText() {
+      return (
+        this.report.resource.title || this.$filters.removeHtml(this.report.resource.contentExcerpt)
+      )
+    },
+    statusIconName() {
+      return this.isDisabled ? 'eye-slash' : 'eye'
+    },
+    statusText() {
+      if (!this.report.reviewed) return this.$t('moderation.reports.enabled')
+      else if (this.isDisabled) return this.$t('moderation.reports.disabledBy')
+      else return this.$t('moderation.reports.enabledBy')
+    },
+    moderatorOfLatestReview() {
+      return this.report.reviewed[0].moderator
+    },
+  },
+}
+</script>
+
+<style lang="scss">
+.report-row {
+  &:nth-child(2n + 1) {
+    background-color: $color-neutral-95;
+  }
+
+  .title {
+    font-weight: $font-weight-bold;
+  }
+
+  .status-line {
+    display: inline-flex;
+
+    > .base-icon {
+      margin-right: $space-xx-small;
+    }
+  }
+
+  .user-count {
+    display: block;
+    margin-bottom: $space-xx-small;
+  }
+
+  .--disabled {
+    color: $color-danger;
+  }
+
+  .--enabled {
+    color: $color-success;
+  }
+}
+</style>

From 42540eb909721b73ca152c9ff7c2d4a8ae6cd9c0 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Wed, 4 Dec 2019 19:55:48 +0100
Subject: [PATCH 173/174] Remove dead code, code creep

---
 .../notificationsMiddleware.spec.js           |  2 +-
 ...nge_disabled_relationship_to_claim_node.sh | 55 -------------------
 .../change_report_node_to_relationship.sh     | 26 ---------
 3 files changed, 1 insertion(+), 82 deletions(-)
 delete mode 100755 neo4j/change_disabled_relationship_to_claim_node.sh
 delete mode 100644 neo4j/storeOldScriptsAsTemplates/change_report_node_to_relationship.sh

diff --git a/backend/src/middleware/notifications/notificationsMiddleware.spec.js b/backend/src/middleware/notifications/notificationsMiddleware.spec.js
index 2122d009b..502ddaa8e 100644
--- a/backend/src/middleware/notifications/notificationsMiddleware.spec.js
+++ b/backend/src/middleware/notifications/notificationsMiddleware.spec.js
@@ -371,7 +371,7 @@ describe('notifications', () => {
                 expect(readAfter).toEqual(false)
               })
 
-              it('does not update the `createdAt` attribute', async () => {
+              it('updates the `createdAt` attribute', async () => {
                 await createPostAction()
                 await markAsReadAction()
                 const {
diff --git a/neo4j/change_disabled_relationship_to_claim_node.sh b/neo4j/change_disabled_relationship_to_claim_node.sh
deleted file mode 100755
index 9d587d906..000000000
--- a/neo4j/change_disabled_relationship_to_claim_node.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/usr/bin/env bash
-
-ENV_FILE=$(dirname "$0")/.env
-[[ -f "$ENV_FILE" ]] && source "$ENV_FILE"
-
-if [ -z "$NEO4J_USERNAME" ] || [ -z "$NEO4J_PASSWORD" ]; then
-  echo "Please set NEO4J_USERNAME and NEO4J_PASSWORD environment variables."
-  echo "Database manipulation is not possible without connecting to the database."
-  echo "E.g. you could \`cp .env.template .env\` unless you run the script in a docker container"
-fi
-
-until echo 'RETURN "Connection successful" as info;' | cypher-shell
-do
-  echo "Connecting to neo4j failed, trying again..."
-  sleep 1
-done
-
-echo "
-// convert old DISABLED to new REVIEWED-Report-BELONGS_TO structure
-MATCH (moderator:User)-[disabled:DISABLED]->(disabledResource)
-WHERE disabledResource:User OR disabledResource:Comment OR disabledResource:Post
-DELETE disabled
-CREATE (moderator)-[review:REVIEWED]->(report:Report)-[:BELONGS_TO]->(disabledResource)
-SET review.createdAt = toString(datetime()), review.updatedAt = review.createdAt, review.disable = true
-SET report.id = randomUUID(), report.createdAt = toString(datetime()), report.updatedAt = report.createdAt, report.rule = 'latestReviewUpdatedAtRules', report.disable = true, report.closed = false
-
-// if disabledResource has no report, then create a moderators default report
-WITH moderator, disabledResource, report
-OPTIONAL MATCH (disabledResourceReporter:User)-[existingReport:FILED]->(disabledResource)
-FOREACH(disabledResource IN CASE WHEN existingReport IS NULL THEN [1] ELSE [] END | 
-  CREATE (moderator)-[addModeratorReport:FILED]->(report)
-  SET addModeratorReport.createdAt = toString(datetime()), addModeratorReport.reasonCategory = 'other', addModeratorReport.reasonDescription = 'Old DISABLED relation had no now mandatory report !!! Created automatically to ensure database consistency! Creation date is when the database manipulation happened.'
-)
-FOREACH(disabledResource IN CASE WHEN existingReport IS NOT NULL THEN [1] ELSE [] END | 
-  CREATE (disabledResourceReporter)-[moveModeratorReport:FILED]->(report)
-  SET moveModeratorReport = existingReport
-  DELETE existingReport
-)
-
-RETURN disabledResource {.id};
-" | cypher-shell
-
-echo "
-// for FILED resources without DISABLED relation which are handled above, create new FILED-Report-BELONGS_TO structure
-MATCH (reporter:User)-[oldReport:FILED]->(notDisabledResource)
-WHERE notDisabledResource:User OR notDisabledResource:Comment OR notDisabledResource:Post
-MERGE (report:Report)-[:BELONGS_TO]->(notDisabledResource)
-ON CREATE SET report.id = randomUUID(), report.createdAt = toString(datetime()), report.updatedAt = report.createdAt, report.rule = 'latestReviewUpdatedAtRules', report.disable = false, report.closed = false
-CREATE (reporter)-[report:FILED]->(report)
-SET report = oldReport
-DELETE oldReport
-
-RETURN notDisabledResource {.id};
-" | cypher-shell
-
diff --git a/neo4j/storeOldScriptsAsTemplates/change_report_node_to_relationship.sh b/neo4j/storeOldScriptsAsTemplates/change_report_node_to_relationship.sh
deleted file mode 100644
index da3a1dad9..000000000
--- a/neo4j/storeOldScriptsAsTemplates/change_report_node_to_relationship.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env bash
-
-ENV_FILE=$(dirname "$0")/.env
-[[ -f "$ENV_FILE" ]] && source "$ENV_FILE"
-
-if [ -z "$NEO4J_USERNAME" ] || [ -z "$NEO4J_PASSWORD" ]; then
-  echo "Please set NEO4J_USERNAME and NEO4J_PASSWORD environment variables."
-  echo "Database manipulation is not possible without connecting to the database."
-  echo "E.g. you could \`cp .env.template .env\` unless you run the script in a docker container"
-fi
-
-until echo 'RETURN "Connection successful" as info;' | cypher-shell
-do
-  echo "Connecting to neo4j failed, trying again..."
-  sleep 1
-done
-
-echo "
-MATCH (submitter:User)-[:FILED]->(report:Report)-[:FILED]->(resource)
-DETACH DELETE report
-CREATE (submitter)-[reported:FILED]->(resource)
-SET reported.createdAt = toString(datetime())
-SET reported.reasonCategory = 'other'
-SET reported.reasonDescription = '!!! Created automatically to ensure database consistency! Creation date is when the database manipulation happened.'
-RETURN reported;
-" | cypher-shell
\ No newline at end of file

From 8bd69e9e2fa327ab81b3740070d6a29a0b92b005 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Wed, 4 Dec 2019 20:11:34 +0100
Subject: [PATCH 174/174] Fix import path

---
 webapp/components/features/ReportRow/ReportRow.spec.js       | 2 +-
 webapp/components/features/ReportsTable/ReportsTable.spec.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapp/components/features/ReportRow/ReportRow.spec.js b/webapp/components/features/ReportRow/ReportRow.spec.js
index ff0d51f5f..352011a28 100644
--- a/webapp/components/features/ReportRow/ReportRow.spec.js
+++ b/webapp/components/features/ReportRow/ReportRow.spec.js
@@ -2,7 +2,7 @@ import { config, mount, RouterLinkStub } from '@vue/test-utils'
 import Vuex from 'vuex'
 import ReportRow from './ReportRow.vue'
 import BaseIcon from '~/components/_new/generic/BaseIcon/BaseIcon'
-import { reports } from '~/components/features/ReportsList/ReportsList.story.js'
+import { reports } from '~/components/features/ReportList/ReportList.story.js'
 
 const localVue = global.localVue
 
diff --git a/webapp/components/features/ReportsTable/ReportsTable.spec.js b/webapp/components/features/ReportsTable/ReportsTable.spec.js
index 0aa80b492..222ade83c 100644
--- a/webapp/components/features/ReportsTable/ReportsTable.spec.js
+++ b/webapp/components/features/ReportsTable/ReportsTable.spec.js
@@ -1,7 +1,7 @@
 import { config, mount } from '@vue/test-utils'
 import Vuex from 'vuex'
 import ReportsTable from './ReportsTable.vue'
-import { reports } from '~/components/features/ReportsList/ReportsList.story.js'
+import { reports } from '~/components/features/ReportList/ReportList.story.js'
 
 const localVue = global.localVue