From 958b88ceda976f35334069f5c7ef8dc31600b3b6 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Sat, 2 Nov 2019 07:59:35 +0100
Subject: [PATCH 1/7] 2106-unblock a user in the user settings

---
 webapp/locales/de.json                  |  6 ++++--
 webapp/locales/en.json                  |  6 ++++--
 webapp/pages/settings/blocked-users.vue | 15 ++++++++++++++-
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index a9cf7ce2c..2b99bfede 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -313,12 +313,14 @@
       },
       "columns": {
         "name": "Name",
-        "slug": "Alias"
+        "slug": "Alias",
+        "unblk": "Entblocken"
       },
       "empty": "Bislang hast du niemanden blockiert.",
       "how-to": "Du kannst andere Benutzer auf deren Profilseite über das Inhaltsmenü blockieren.",
       "block": "Nutzer blockieren",
-      "unblock": "Nutzer entblocken"
+      "unblock": "Nutzer entblocken",
+      "unblocked": " ist wieder entblockt"
     }
   },
   "admin": {
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 15ef63a95..8b3ea7165 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -314,12 +314,14 @@
       },
       "columns": {
         "name": "Name",
-        "slug": "Slug"
+        "slug": "Slug",
+        "unblk": "Unblock"
       },
       "empty": "So far, you have not blocked anybody.",
       "how-to": "You can block other users on their profile page via the content menu.",
       "block": "Block user",
-      "unblock": "Unblock user"
+      "unblock": "Unblock user",
+      "unblocked": " is unblocked again"      
     }
   },
   "admin": {
diff --git a/webapp/pages/settings/blocked-users.vue b/webapp/pages/settings/blocked-users.vue
index 19e24c994..c698ca610 100644
--- a/webapp/pages/settings/blocked-users.vue
+++ b/webapp/pages/settings/blocked-users.vue
@@ -56,6 +56,11 @@
             <b>{{ scope.row.slug | truncate(20) }}</b>
           </nuxt-link>
         </template>
+       
+        <template slot="unblock" slot-scope="scope" > 
+            <ds-button   size="small" @click="unblock(scope)"><ds-icon name="power-off" /></ds-button>
+        </template>
+       
       </ds-table>
     </ds-card>
     <ds-card v-else>
@@ -74,7 +79,7 @@
 </template>
 
 <script>
-import { BlockedUsers } from '~/graphql/settings/BlockedUsers'
+import { BlockedUsers, Unblock} from '~/graphql/settings/BlockedUsers'
 import HcAvatar from '~/components/Avatar/Avatar.vue'
 
 export default {
@@ -92,12 +97,20 @@ export default {
         avatar: '',
         name: this.$t('settings.blocked-users.columns.name'),
         slug: this.$t('settings.blocked-users.columns.slug'),
+        unblock: this.$t('settings.blocked-users.columns.unblock'),
       }
     },
   },
   apollo: {
     blockedUsers: { query: BlockedUsers, fetchPolicy: 'cache-and-network' },
   },
+  methods: {   
+     async unblock(user) {
+       await this.$apollo.mutate({ mutation: Unblock(), variables: { id: user.row.id } })
+       this.$apollo.queries.blockedUsers.refetch()
+       this.$toast.success(user.row.slug + " " + this.$t('settings.blocked-users.unblocked'))
+    },
+  },
 }
 </script>
 

From e7056dd1006027ab32d83f2c62f52d48dd13d23d Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Sat, 2 Nov 2019 08:53:13 +0100
Subject: [PATCH 2/7] fix lint

---
 webapp/pages/settings/blocked-users.vue | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/webapp/pages/settings/blocked-users.vue b/webapp/pages/settings/blocked-users.vue
index c698ca610..6a0b828fe 100644
--- a/webapp/pages/settings/blocked-users.vue
+++ b/webapp/pages/settings/blocked-users.vue
@@ -56,11 +56,10 @@
             <b>{{ scope.row.slug | truncate(20) }}</b>
           </nuxt-link>
         </template>
-       
-        <template slot="unblock" slot-scope="scope" > 
-            <ds-button   size="small" @click="unblock(scope)"><ds-icon name="power-off" /></ds-button>
+
+        <template slot="unblock" slot-scope="scope">
+          <ds-button size="small" @click="unblock(scope)"><ds-icon name="power-off" /></ds-button>
         </template>
-       
       </ds-table>
     </ds-card>
     <ds-card v-else>
@@ -79,7 +78,7 @@
 </template>
 
 <script>
-import { BlockedUsers, Unblock} from '~/graphql/settings/BlockedUsers'
+import { BlockedUsers, Unblock } from '~/graphql/settings/BlockedUsers'
 import HcAvatar from '~/components/Avatar/Avatar.vue'
 
 export default {
@@ -104,11 +103,11 @@ export default {
   apollo: {
     blockedUsers: { query: BlockedUsers, fetchPolicy: 'cache-and-network' },
   },
-  methods: {   
-     async unblock(user) {
-       await this.$apollo.mutate({ mutation: Unblock(), variables: { id: user.row.id } })
-       this.$apollo.queries.blockedUsers.refetch()
-       this.$toast.success(user.row.slug + " " + this.$t('settings.blocked-users.unblocked'))
+  methods: {
+    async unblock(user) {
+      await this.$apollo.mutate({ mutation: Unblock(), variables: { id: user.row.id } })
+      this.$apollo.queries.blockedUsers.refetch()
+      this.$toast.success(user.row.slug + ' ' + this.$t('settings.blocked-users.unblocked'))
     },
   },
 }

From 4b2da76709c60bdf2a425f912288b83b8239226b Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Tue, 5 Nov 2019 14:07:45 +0100
Subject: [PATCH 3/7] change unblk TO unblock

unblk TO unblock
---
 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 2b99bfede..fcd3ba2c4 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -314,7 +314,7 @@
       "columns": {
         "name": "Name",
         "slug": "Alias",
-        "unblk": "Entblocken"
+        "unblock": "Entblocken"
       },
       "empty": "Bislang hast du niemanden blockiert.",
       "how-to": "Du kannst andere Benutzer auf deren Profilseite über das Inhaltsmenü blockieren.",

From 9bd1c594638678414f63252637d5112c9d9e79e2 Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Tue, 5 Nov 2019 14:08:25 +0100
Subject: [PATCH 4/7] change unblk to unblock

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

diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 8b3ea7165..455d92d3f 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -315,7 +315,7 @@
       "columns": {
         "name": "Name",
         "slug": "Slug",
-        "unblk": "Unblock"
+        "unblock": "Unblock"
       },
       "empty": "So far, you have not blocked anybody.",
       "how-to": "You can block other users on their profile page via the content menu.",

From dcc9889ceeef4bd8b785e6dcf23f47eac83ba1e3 Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Thu, 14 Nov 2019 11:26:44 +0100
Subject: [PATCH 5/7] Update webapp/locales/en.json

Co-Authored-By: Alina Beck <alina.beck@mail.com>
---
 webapp/locales/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 455d92d3f..70592b2fd 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -321,7 +321,7 @@
       "how-to": "You can block other users on their profile page via the content menu.",
       "block": "Block user",
       "unblock": "Unblock user",
-      "unblocked": " is unblocked again"      
+      "unblocked": "is unblocked again"
     }
   },
   "admin": {

From 767b4c8f15eacec3bf94f0fbad6232f6aaeaf3ac Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Thu, 14 Nov 2019 11:26:56 +0100
Subject: [PATCH 6/7] Update webapp/locales/de.json

Co-Authored-By: Alina Beck <alina.beck@mail.com>
---
 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 fcd3ba2c4..f1ddff599 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -320,7 +320,7 @@
       "how-to": "Du kannst andere Benutzer auf deren Profilseite über das Inhaltsmenü blockieren.",
       "block": "Nutzer blockieren",
       "unblock": "Nutzer entblocken",
-      "unblocked": " ist wieder entblockt"
+      "unblocked": "ist wieder entblockt"
     }
   },
   "admin": {

From 56a940285bbe00cc6bced2999c5d474466c5eaee Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Fri, 15 Nov 2019 14:29:06 +0100
Subject: [PATCH 7/7] refactor: translations, tests

---
 webapp/locales/de.json                      |  2 +-
 webapp/locales/en.json                      |  2 +-
 webapp/pages/settings/blocked-users.spec.js | 69 +++++++++++++++++++++
 webapp/pages/settings/blocked-users.vue     |  5 +-
 4 files changed, 74 insertions(+), 4 deletions(-)
 create mode 100644 webapp/pages/settings/blocked-users.spec.js

diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index f1ddff599..e17b57502 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -320,7 +320,7 @@
       "how-to": "Du kannst andere Benutzer auf deren Profilseite über das Inhaltsmenü blockieren.",
       "block": "Nutzer blockieren",
       "unblock": "Nutzer entblocken",
-      "unblocked": "ist wieder entblockt"
+      "unblocked": "{name} ist wieder entblockt"
     }
   },
   "admin": {
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 70592b2fd..f0bc1115d 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -321,7 +321,7 @@
       "how-to": "You can block other users on their profile page via the content menu.",
       "block": "Block user",
       "unblock": "Unblock user",
-      "unblocked": "is unblocked again"
+      "unblocked": "{name} is unblocked again"
     }
   },
   "admin": {
diff --git a/webapp/pages/settings/blocked-users.spec.js b/webapp/pages/settings/blocked-users.spec.js
new file mode 100644
index 000000000..c78de5dc7
--- /dev/null
+++ b/webapp/pages/settings/blocked-users.spec.js
@@ -0,0 +1,69 @@
+import { config, mount, createLocalVue } from '@vue/test-utils'
+import BlockedUsers from './blocked-users.vue'
+import Styleguide from '@human-connection/styleguide'
+import Filters from '~/plugins/vue-filters'
+import { Unblock } from '~/graphql/settings/BlockedUsers'
+
+const localVue = createLocalVue()
+
+localVue.use(Styleguide)
+localVue.use(Filters)
+
+config.stubs['nuxt-link'] = '<span><slot /></span>'
+
+describe('blocked-users.vue', () => {
+  let wrapper
+  let mocks
+
+  beforeEach(() => {
+    mocks = {
+      $t: jest.fn(),
+      $apollo: {
+        mutate: jest.fn(),
+        queries: {
+          blockedUsers: {
+            refetch: jest.fn(),
+          },
+        },
+      },
+      $toast: {
+        error: jest.fn(),
+        success: jest.fn(),
+      },
+    }
+  })
+
+  describe('mount', () => {
+    const Wrapper = () => {
+      return mount(BlockedUsers, { mocks, localVue })
+    }
+
+    beforeEach(() => {
+      wrapper = Wrapper()
+    })
+
+    it('renders', () => {
+      expect(wrapper.is('div')).toBe(true)
+    })
+
+    describe('given a list of blocked users', () => {
+      beforeEach(() => {
+        const blockedUsers = [{ id: 'u1', name: 'John Doe', slug: 'john-doe', avatar: '' }]
+        wrapper.setData({ blockedUsers })
+      })
+
+      describe('click unblock', () => {
+        beforeEach(() => {
+          wrapper.find('button').trigger('click')
+        })
+
+        it('calls unblock mutation with given user', () => {
+          expect(mocks.$apollo.mutate).toHaveBeenCalledWith({
+            mutation: Unblock(),
+            variables: { id: 'u1' },
+          })
+        })
+      })
+    })
+  })
+})
diff --git a/webapp/pages/settings/blocked-users.vue b/webapp/pages/settings/blocked-users.vue
index 6a0b828fe..acbd253aa 100644
--- a/webapp/pages/settings/blocked-users.vue
+++ b/webapp/pages/settings/blocked-users.vue
@@ -58,7 +58,7 @@
         </template>
 
         <template slot="unblock" slot-scope="scope">
-          <ds-button size="small" @click="unblock(scope)"><ds-icon name="power-off" /></ds-button>
+          <ds-button size="small" @click="unblock(scope)"><ds-icon name="user-plus" /></ds-button>
         </template>
       </ds-table>
     </ds-card>
@@ -107,7 +107,8 @@ export default {
     async unblock(user) {
       await this.$apollo.mutate({ mutation: Unblock(), variables: { id: user.row.id } })
       this.$apollo.queries.blockedUsers.refetch()
-      this.$toast.success(user.row.slug + ' ' + this.$t('settings.blocked-users.unblocked'))
+      const { name } = user.row
+      this.$toast.success(this.$t('settings.blocked-users.unblocked', { name }))
     },
   },
 }