From 481c96ee046fc51fdfb7b35b651bb672771ef6ae Mon Sep 17 00:00:00 2001
From: Raphael Beer <raphael.beer@protonmail.com>
Date: Mon, 16 Mar 2020 14:25:14 +0100
Subject: [PATCH 01/54] Change: seed db with all random users being
 followers/followed by user@example.com

---
 backend/src/db/seed.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/backend/src/db/seed.js b/backend/src/db/seed.js
index 47633b507..ca33a50ee 100644
--- a/backend/src/db/seed.js
+++ b/backend/src/db/seed.js
@@ -928,7 +928,15 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
       trollingComment.update({ disabled: true, updatedAt: new Date().toISOString(), closed: true }),
     ])
 
-    await Promise.all([...Array(30).keys()].map(() => Factory.build('user')))
+    const additionalUsers = await Promise.all(
+      [...Array(30).keys()].map(() => Factory.build('user')),
+    )
+    await Promise.all(
+      additionalUsers.map(async user => {
+        await jennyRostock.relateTo(user, 'following')
+        await user.relateTo(jennyRostock, 'following')
+      }),
+    )
 
     await Promise.all(
       [...Array(30).keys()].map(() =>

From a873aac44d900a188b444dc594f191f5daa1bd53 Mon Sep 17 00:00:00 2001
From: Raphael Beer <raphael.beer@protonmail.com>
Date: Wed, 18 Mar 2020 08:40:13 +0100
Subject: [PATCH 02/54] Refactor: extract FollowList from profile page

---
 webapp/components/features/FollowList.spec.js | 389 ++++++++++++++++++
 webapp/components/features/FollowList.vue     |  67 +++
 webapp/pages/profile/_id/_slug.vue            |  62 +--
 3 files changed, 460 insertions(+), 58 deletions(-)
 create mode 100644 webapp/components/features/FollowList.spec.js
 create mode 100644 webapp/components/features/FollowList.vue

diff --git a/webapp/components/features/FollowList.spec.js b/webapp/components/features/FollowList.spec.js
new file mode 100644
index 000000000..a922c63c7
--- /dev/null
+++ b/webapp/components/features/FollowList.spec.js
@@ -0,0 +1,389 @@
+import { config, mount } from '@vue/test-utils'
+import Vuex from 'vuex'
+import FollowList from './FollowList.vue'
+
+const localVue = global.localVue
+
+config.stubs['client-only'] = '<span><slot /></span>'
+config.stubs['ds-space'] = '<span><slot /></span>'
+config.stubs['nuxt-link'] = '<span><slot /></span>'
+
+let user
+
+describe('FollowList.vue', () => {
+  let store, mocks, getters, propsData
+
+  beforeAll(() => {
+    mocks = {
+      $t: jest.fn(),
+    }
+    getters = {
+      'auth/user': () => {
+        return {}
+      },
+      'auth/isModerator': () => false,
+    }
+    propsData = { user }
+  })
+
+  describe('mount', () => {
+    beforeAll(() => {
+      store = new Vuex.Store({
+        getters,
+      })
+    })
+
+    describe('given a user with connections', () => {
+      it('shows the users following', () => {
+        const wrapper = mount(FollowList, {
+          store,
+          propsData: { ...propsData, type: 'following' },
+          mocks,
+          localVue,
+        })
+        expect(wrapper.findAll('.user-teaser').length).toEqual(user.following.length)
+      })
+      it('shows the users being followed', () => {
+        const wrapper = mount(FollowList, {
+          store,
+          propsData: { ...propsData, type: 'followedBy' },
+          mocks,
+          localVue,
+        })
+        expect(wrapper.findAll('.user-teaser').length).toEqual(user.followedBy.length)
+      })
+    })
+  })
+})
+
+user = {
+  name: 'Jenny Rostock',
+  id: 'u3',
+  followedByCount: 32,
+  followingCount: 31,
+  followedBy: [
+    {
+      id: '2877b626-bac0-43df-b2bf-4ee025ba38b2',
+      name: 'Kristina Beahan',
+      slug: 'kristina-beahan',
+    },
+    {
+      id: '16b8838d-cc9f-4d30-8601-e4dea77d2f02',
+      name: 'Rhonda Stokes',
+      slug: 'rhonda-stokes',
+    },
+    {
+      id: '47a9846a-87d4-43fa-bf81-51d21dc38ed3',
+      name: 'Benny Lang',
+      slug: 'benny-lang',
+    },
+    {
+      id: 'd3d43b17-e7bb-4778-a373-798df58a9a5f',
+      name: 'Ms. Rita Thompson',
+      slug: 'ms-rita-thompson',
+    },
+    {
+      id: '18a4827c-8b5f-4510-b6fe-09fe8688eed1',
+      name: 'Arthur Johns',
+      slug: 'arthur-johns',
+    },
+    {
+      id: '45313bea-9152-4c8d-9c6e-1eca029979f8',
+      name: 'Jeremiah Breitenberg',
+      slug: 'jeremiah-breitenberg',
+    },
+    {
+      id: 'cfaf1c25-f0ad-4bdf-82a3-e4d8d5e5093e',
+      name: 'Dominic Weimann Jr.',
+      slug: 'dominic-weimann-jr',
+    },
+  ],
+  following: [
+    {
+      id: '16b8838d-cc9f-4d30-8601-e4dea77d2f02',
+      name: 'Rhonda Stokes',
+      slug: 'rhonda-stokes',
+    },
+    {
+      id: '47a9846a-87d4-43fa-bf81-51d21dc38ed3',
+      name: 'Benny Lang',
+      slug: 'benny-lang',
+    },
+    {
+      id: '18a4827c-8b5f-4510-b6fe-09fe8688eed1',
+      name: 'Arthur Johns',
+      slug: 'arthur-johns',
+    },
+    {
+      id: 'cfaf1c25-f0ad-4bdf-82a3-e4d8d5e5093e',
+      name: 'Dominic Weimann Jr.',
+      slug: 'dominic-weimann-jr',
+    },
+    {
+      id: '69dbad2b-5749-4697-9976-221992439086',
+      name: 'Ashley Fisher',
+      slug: 'ashley-fisher',
+    },
+    {
+      id: 'a09a2341-0575-4235-96c6-2ebc7d77de3f',
+      name: 'Phil Dare',
+      slug: 'phil-dare',
+    },
+    {
+      id: '2877b626-bac0-43df-b2bf-4ee025ba38b2',
+      name: 'Kristina Beahan',
+      slug: 'kristina-beahan',
+    },
+  ],
+}
+
+const additionalFollowedBy = [
+  {
+    id: '9f305e7a-ae5a-4e22-8269-8b6899af674f',
+    name: 'Hugh Harris Sr.',
+    slug: 'hugh-harris-sr',
+  },
+  {
+    id: '69dbad2b-5749-4697-9976-221992439086',
+    name: 'Ashley Fisher',
+    slug: 'ashley-fisher',
+  },
+  {
+    id: 'eec8ee9e-ee4e-4b83-b655-a106eb857611',
+    name: 'Devin Reynolds',
+    slug: 'devin-reynolds',
+  },
+  {
+    id: 'f638fad4-73c2-4bc9-ae4e-2e53035397e9',
+    name: 'Sophia Jaskolski',
+    slug: 'sophia-jaskolski',
+  },
+  {
+    id: '61040fdf-da6a-489e-b79c-45f58d33386f',
+    name: 'Rodolfo Lind',
+    slug: 'rodolfo-lind',
+  },
+  {
+    id: 'a09a2341-0575-4235-96c6-2ebc7d77de3f',
+    name: 'Phil Dare',
+    slug: 'phil-dare',
+  },
+  {
+    id: 'c5f7eea9-ee4b-4384-91cd-b6c7d128f122',
+    name: 'Omar Turcotte',
+    slug: 'omar-turcotte',
+  },
+  {
+    id: '036cae06-5c8f-4ffb-923e-73b2baba1a00',
+    name: 'Rosemary Wiegand',
+    slug: 'rosemary-wiegand',
+  },
+  {
+    id: '9011b4fd-feec-4b74-b6d0-e0a41b6658e6',
+    name: 'Lela Kautzer',
+    slug: 'lela-kautzer',
+  },
+  {
+    id: '019a48f6-5785-4c5c-a2ac-7cb80007aa41',
+    name: 'Roosevelt Lindgren III',
+    slug: 'roosevelt-lindgren-iii',
+  },
+  {
+    id: '3a089655-19c8-478f-97c1-345b3dfc95a3',
+    name: 'Lee Erdman',
+    slug: 'lee-erdman',
+  },
+  {
+    id: '8af5df96-8c09-4fe4-a9cd-572840c94529',
+    name: 'Mamie Conn',
+    slug: 'mamie-conn',
+  },
+  {
+    id: 'ca1b7bcb-1254-43ff-90a1-b0e6d49c31bc',
+    name: 'Sergio Casper',
+    slug: 'sergio-casper',
+  },
+  {
+    id: '4c11e030-0419-43a0-8d7a-dc198b57efd7',
+    name: 'Charles Ruecker',
+    slug: 'charles-ruecker',
+  },
+  {
+    id: '25983fa2-a861-46f3-9c71-124286de7367',
+    name: 'Caroline Pollich',
+    slug: 'caroline-pollich',
+  },
+  {
+    id: '687a0fcb-531d-42c1-8854-a47dc59f61e7',
+    name: 'Dr. Darryl Rath',
+    slug: 'dr-darryl-rath',
+  },
+  {
+    id: 'd0ecaa07-0ba1-4deb-ac6f-1dc01cdd6174',
+    name: 'Isaac Purdy MD',
+    slug: 'isaac-purdy-md',
+  },
+  {
+    id: 'c0846aa5-7f3e-44d9-89db-bef675cac431',
+    name: 'Nichole Schamberger',
+    slug: 'nichole-schamberger',
+  },
+  {
+    id: 'u6',
+    name: 'Louie',
+    slug: 'louie',
+  },
+  {
+    id: 'u1',
+    name: 'Peter Lustig',
+    slug: 'peter-lustig',
+  },
+  {
+    id: '6de37964-e79b-4be4-b384-ed571c37a31e',
+    name: 'Mr. Oliver Quitzon',
+    slug: 'mr-oliver-quitzon',
+  },
+  {
+    id: '96446bee-ce95-47d6-acc1-742c70d21518',
+    name: 'Myrtle Williamson',
+    slug: 'myrtle-williamson',
+  },
+  {
+    id: '9e58bc8d-d63a-4b03-92df-fb540ff8b2ce',
+    name: 'Andy Stracke',
+    slug: 'andy-stracke',
+  },
+  {
+    id: 'd808b58b-b097-4614-a2c5-81187e9884ca',
+    name: 'Warren Crist',
+    slug: 'warren-crist',
+  },
+  {
+    id: 'ff800e3a-ceba-44e9-904b-458c20e518ff',
+    name: 'Dolores Wilkinson V',
+    slug: 'dolores-wilkinson-v',
+  },
+]
+
+const additionalFollowing = [
+  {
+    id: '9011b4fd-feec-4b74-b6d0-e0a41b6658e6',
+    name: 'Lela Kautzer',
+    slug: 'lela-kautzer',
+  },
+  {
+    id: '61040fdf-da6a-489e-b79c-45f58d33386f',
+    name: 'Rodolfo Lind',
+    slug: 'rodolfo-lind',
+  },
+  {
+    id: '3a089655-19c8-478f-97c1-345b3dfc95a3',
+    name: 'Lee Erdman',
+    slug: 'lee-erdman',
+  },
+  {
+    id: 'c5f7eea9-ee4b-4384-91cd-b6c7d128f122',
+    name: 'Omar Turcotte',
+    slug: 'omar-turcotte',
+  },
+  {
+    id: 'f638fad4-73c2-4bc9-ae4e-2e53035397e9',
+    name: 'Sophia Jaskolski',
+    slug: 'sophia-jaskolski',
+  },
+  {
+    id: 'u4',
+    name: 'Huey',
+    slug: 'huey',
+  },
+  {
+    id: '6de37964-e79b-4be4-b384-ed571c37a31e',
+    name: 'Mr. Oliver Quitzon',
+    slug: 'mr-oliver-quitzon',
+  },
+  {
+    id: 'd3d43b17-e7bb-4778-a373-798df58a9a5f',
+    name: 'Ms. Rita Thompson',
+    slug: 'ms-rita-thompson',
+  },
+  {
+    id: '036cae06-5c8f-4ffb-923e-73b2baba1a00',
+    name: 'Rosemary Wiegand',
+    slug: 'rosemary-wiegand',
+  },
+  {
+    id: 'eec8ee9e-ee4e-4b83-b655-a106eb857611',
+    name: 'Devin Reynolds',
+    slug: 'devin-reynolds',
+  },
+  {
+    id: '96446bee-ce95-47d6-acc1-742c70d21518',
+    name: 'Myrtle Williamson',
+    slug: 'myrtle-williamson',
+  },
+  {
+    id: '9f305e7a-ae5a-4e22-8269-8b6899af674f',
+    name: 'Hugh Harris Sr.',
+    slug: 'hugh-harris-sr',
+  },
+  {
+    id: 'c0846aa5-7f3e-44d9-89db-bef675cac431',
+    name: 'Nichole Schamberger',
+    slug: 'nichole-schamberger',
+  },
+  {
+    id: '019a48f6-5785-4c5c-a2ac-7cb80007aa41',
+    name: 'Roosevelt Lindgren III',
+    slug: 'roosevelt-lindgren-iii',
+  },
+  {
+    id: 'ff800e3a-ceba-44e9-904b-458c20e518ff',
+    name: 'Dolores Wilkinson V',
+    slug: 'dolores-wilkinson-v',
+  },
+  {
+    id: '9e58bc8d-d63a-4b03-92df-fb540ff8b2ce',
+    name: 'Andy Stracke',
+    slug: 'andy-stracke',
+  },
+  {
+    id: 'd808b58b-b097-4614-a2c5-81187e9884ca',
+    name: 'Warren Crist',
+    slug: 'warren-crist',
+  },
+  {
+    id: '45313bea-9152-4c8d-9c6e-1eca029979f8',
+    name: 'Jeremiah Breitenberg',
+    slug: 'jeremiah-breitenberg',
+  },
+  {
+    id: '8af5df96-8c09-4fe4-a9cd-572840c94529',
+    name: 'Mamie Conn',
+    slug: 'mamie-conn',
+  },
+  {
+    id: '4c11e030-0419-43a0-8d7a-dc198b57efd7',
+    name: 'Charles Ruecker',
+    slug: 'charles-ruecker',
+  },
+  {
+    id: '687a0fcb-531d-42c1-8854-a47dc59f61e7',
+    name: 'Dr. Darryl Rath',
+    slug: 'dr-darryl-rath',
+  },
+  {
+    id: 'ca1b7bcb-1254-43ff-90a1-b0e6d49c31bc',
+    name: 'Sergio Casper',
+    slug: 'sergio-casper',
+  },
+  {
+    id: '25983fa2-a861-46f3-9c71-124286de7367',
+    name: 'Caroline Pollich',
+    slug: 'caroline-pollich',
+  },
+  {
+    id: 'd0ecaa07-0ba1-4deb-ac6f-1dc01cdd6174',
+    name: 'Isaac Purdy MD',
+    slug: 'isaac-purdy-md',
+  },
+]
diff --git a/webapp/components/features/FollowList.vue b/webapp/components/features/FollowList.vue
new file mode 100644
index 000000000..e06b7108a
--- /dev/null
+++ b/webapp/components/features/FollowList.vue
@@ -0,0 +1,67 @@
+<template>
+  <base-card style="position: relative; height: auto;">
+    <ds-space v-if="this.connections && this.connections.length" margin="x-small">
+      <ds-text tag="h5" color="soft">
+        {{ userName | truncate(15) }} {{ $t('profile.network.following') }}
+      </ds-text>
+    </ds-space>
+    <template v-if="this.connections && this.connections.length">
+      <ds-space v-for="follow in uniq(this.connections)" :key="follow.id" margin="x-small">
+        <!-- TODO: find better solution for rendering errors -->
+        <client-only>
+          <user-teaser :user="follow" />
+        </client-only>
+      </ds-space>
+      <ds-space v-if="this.user.followedByCount - this.connections.length" margin="small">
+        <ds-text size="small" color="soft">
+        {{
+          $t('profile.network.andMore', {
+            number: this.user.followedByCount - this.connections.length,
+          })
+        }}
+        </ds-text>
+      </ds-space>
+    </template>
+    <template v-else>
+      <p style="text-align: center; opacity: .5;">
+        {{ userName }} {{ $t('profile.network.followingNobody') }}
+      </p>
+    </template>
+  </base-card>
+</template>
+
+<script>
+import uniqBy from 'lodash/uniqBy'
+import UserAvatar from '~/components/_new/generic/UserAvatar/UserAvatar'
+import UserTeaser from '~/components/UserTeaser/UserTeaser'
+
+let expanded = false
+
+export default {
+  name: 'FollowerList',
+  components: {
+    UserAvatar,
+    UserTeaser,
+  },
+  props: {
+    user: { type: Object, default: null },
+    type: { type: String, default: 'following' },
+  },
+  data() {
+    return {
+      connections: this.user[this.type],
+    }
+  },
+  computed: {
+    userName() {
+      const { name } = this.user || {}
+      return name || this.$t('profile.userAnonym')
+    },
+  },
+  methods: {
+    uniq(items, field = 'id') {
+      return uniqBy(items, field)
+    },
+  },
+}
+</script>
diff --git a/webapp/pages/profile/_id/_slug.vue b/webapp/pages/profile/_id/_slug.vue
index 2b3ccb888..37ce43892 100644
--- a/webapp/pages/profile/_id/_slug.vue
+++ b/webapp/pages/profile/_id/_slug.vue
@@ -89,65 +89,9 @@
         <ds-heading tag="h3" soft style="text-align: center; margin-bottom: 10px;">
           {{ $t('profile.network.title') }}
         </ds-heading>
-        <base-card style="position: relative; height: auto;">
-          <ds-space v-if="user.following && user.following.length" margin="x-small">
-            <ds-text tag="h5" color="soft">
-              {{ userName | truncate(15) }} {{ $t('profile.network.following') }}
-            </ds-text>
-          </ds-space>
-          <template v-if="user.following && user.following.length">
-            <ds-space v-for="follow in uniq(user.following)" :key="follow.id" margin="x-small">
-              <!-- TODO: find better solution for rendering errors -->
-              <client-only>
-                <user-teaser :user="follow" />
-              </client-only>
-            </ds-space>
-            <ds-space v-if="user.followingCount - user.following.length" margin="small">
-              <ds-text size="small" color="softer">
-                {{
-                  $t('profile.network.andMore', {
-                    number: user.followingCount - user.following.length,
-                  })
-                }}
-              </ds-text>
-            </ds-space>
-          </template>
-          <template v-else>
-            <p style="text-align: center; opacity: 0.5;">
-              {{ userName }} {{ $t('profile.network.followingNobody') }}
-            </p>
-          </template>
-        </base-card>
+        <follow-list :user="user" type="followedBy" />
         <ds-space />
-        <base-card style="position: relative; height: auto;">
-          <ds-space v-if="user.followedBy && user.followedBy.length" margin="x-small">
-            <ds-text tag="h5" color="soft">
-              {{ userName | truncate(15) }} {{ $t('profile.network.followedBy') }}
-            </ds-text>
-          </ds-space>
-          <template v-if="user.followedBy && user.followedBy.length">
-            <ds-space v-for="follow in uniq(user.followedBy)" :key="follow.id" margin="x-small">
-              <!-- TODO: find better solution for rendering errors -->
-              <client-only>
-                <user-teaser :user="follow" />
-              </client-only>
-            </ds-space>
-            <ds-space v-if="user.followedByCount - user.followedBy.length" margin="small">
-              <ds-text size="small" color="softer">
-                {{
-                  $t('profile.network.andMore', {
-                    number: user.followedByCount - user.followedBy.length,
-                  })
-                }}
-              </ds-text>
-            </ds-space>
-          </template>
-          <template v-else>
-            <p style="text-align: center; opacity: 0.5;">
-              {{ userName }} {{ $t('profile.network.followedByNobody') }}
-            </p>
-          </template>
-        </base-card>
+        <follow-list :user="user" type="following" />
         <ds-space v-if="user.socialMedia && user.socialMedia.length" margin="large">
           <base-card style="position: relative; height: auto;">
             <ds-space margin="x-small">
@@ -276,6 +220,7 @@ import PostTeaser from '~/components/PostTeaser/PostTeaser.vue'
 import HcFollowButton from '~/components/FollowButton.vue'
 import HcCountTo from '~/components/CountTo.vue'
 import HcBadges from '~/components/Badges.vue'
+import FollowList from '~/components/features/FollowList.vue'
 import HcEmpty from '~/components/Empty/Empty'
 import ContentMenu from '~/components/ContentMenu/ContentMenu'
 import HcUpload from '~/components/Upload'
@@ -310,6 +255,7 @@ export default {
     HcUpload,
     MasonryGrid,
     MasonryGridItem,
+    FollowList,
   },
   transition: {
     name: 'slide-up',

From f339ed2c7fed2c9c2fc881978909cb05879c49c9 Mon Sep 17 00:00:00 2001
From: Raphael Beer <raphael.beer@protonmail.com>
Date: Wed, 18 Mar 2020 23:49:30 +0100
Subject: [PATCH 03/54] Add: button to load all remaining connections

---
 webapp/components/features/FollowList.spec.js | 557 +++++++++---------
 webapp/components/features/FollowList.vue     |  37 +-
 webapp/graphql/User.js                        |  25 +
 3 files changed, 341 insertions(+), 278 deletions(-)

diff --git a/webapp/components/features/FollowList.spec.js b/webapp/components/features/FollowList.spec.js
index a922c63c7..43778cf77 100644
--- a/webapp/components/features/FollowList.spec.js
+++ b/webapp/components/features/FollowList.spec.js
@@ -8,7 +8,7 @@ config.stubs['client-only'] = '<span><slot /></span>'
 config.stubs['ds-space'] = '<span><slot /></span>'
 config.stubs['nuxt-link'] = '<span><slot /></span>'
 
-let user
+let user, additionalConnections
 
 describe('FollowList.vue', () => {
   let store, mocks, getters, propsData
@@ -34,24 +34,43 @@ describe('FollowList.vue', () => {
     })
 
     describe('given a user with connections', () => {
-      it('shows the users following', () => {
-        const wrapper = mount(FollowList, {
-          store,
-          propsData: { ...propsData, type: 'following' },
-          mocks,
-          localVue,
-        })
-        expect(wrapper.findAll('.user-teaser').length).toEqual(user.following.length)
-      })
-      it('shows the users being followed', () => {
-        const wrapper = mount(FollowList, {
-          store,
-          propsData: { ...propsData, type: 'followedBy' },
-          mocks,
-          localVue,
-        })
-        expect(wrapper.findAll('.user-teaser').length).toEqual(user.followedBy.length)
-      })
+      ;['following', 'followedBy'].forEach(type =>
+        describe(`and type=${type}`, () => {
+          let wrapper
+          let queryMock
+
+          beforeAll(() => {
+            queryMock = jest.fn().mockResolvedValue({
+              data: { User: [{ [type]: additionalConnections[type] }] },
+            })
+
+            wrapper = mount(FollowList, {
+              store,
+              propsData: { ...propsData, type: type },
+              mocks: {
+                ...mocks,
+                $apollo: {
+                  query: queryMock,
+                },
+              },
+              localVue,
+            })
+          })
+
+          it(`shows the users ${type}`, () => {
+            expect(wrapper.findAll('.user-teaser').length).toEqual(user[type].length)
+          })
+          it(`has a button to load all remaining users ${type}`, async () => {
+            wrapper.find('button').trigger('click')
+            await wrapper.vm.$nextTick()
+            expect(queryMock).toHaveBeenCalledWith({
+              query: wrapper.vm.queries[type],
+              variables: { id: user.id },
+            })
+            expect(wrapper.vm.connections.length).toBe(user[`${type}Count`])
+          })
+        }),
+      )
     })
   })
 })
@@ -137,253 +156,255 @@ user = {
   ],
 }
 
-const additionalFollowedBy = [
-  {
-    id: '9f305e7a-ae5a-4e22-8269-8b6899af674f',
-    name: 'Hugh Harris Sr.',
-    slug: 'hugh-harris-sr',
-  },
-  {
-    id: '69dbad2b-5749-4697-9976-221992439086',
-    name: 'Ashley Fisher',
-    slug: 'ashley-fisher',
-  },
-  {
-    id: 'eec8ee9e-ee4e-4b83-b655-a106eb857611',
-    name: 'Devin Reynolds',
-    slug: 'devin-reynolds',
-  },
-  {
-    id: 'f638fad4-73c2-4bc9-ae4e-2e53035397e9',
-    name: 'Sophia Jaskolski',
-    slug: 'sophia-jaskolski',
-  },
-  {
-    id: '61040fdf-da6a-489e-b79c-45f58d33386f',
-    name: 'Rodolfo Lind',
-    slug: 'rodolfo-lind',
-  },
-  {
-    id: 'a09a2341-0575-4235-96c6-2ebc7d77de3f',
-    name: 'Phil Dare',
-    slug: 'phil-dare',
-  },
-  {
-    id: 'c5f7eea9-ee4b-4384-91cd-b6c7d128f122',
-    name: 'Omar Turcotte',
-    slug: 'omar-turcotte',
-  },
-  {
-    id: '036cae06-5c8f-4ffb-923e-73b2baba1a00',
-    name: 'Rosemary Wiegand',
-    slug: 'rosemary-wiegand',
-  },
-  {
-    id: '9011b4fd-feec-4b74-b6d0-e0a41b6658e6',
-    name: 'Lela Kautzer',
-    slug: 'lela-kautzer',
-  },
-  {
-    id: '019a48f6-5785-4c5c-a2ac-7cb80007aa41',
-    name: 'Roosevelt Lindgren III',
-    slug: 'roosevelt-lindgren-iii',
-  },
-  {
-    id: '3a089655-19c8-478f-97c1-345b3dfc95a3',
-    name: 'Lee Erdman',
-    slug: 'lee-erdman',
-  },
-  {
-    id: '8af5df96-8c09-4fe4-a9cd-572840c94529',
-    name: 'Mamie Conn',
-    slug: 'mamie-conn',
-  },
-  {
-    id: 'ca1b7bcb-1254-43ff-90a1-b0e6d49c31bc',
-    name: 'Sergio Casper',
-    slug: 'sergio-casper',
-  },
-  {
-    id: '4c11e030-0419-43a0-8d7a-dc198b57efd7',
-    name: 'Charles Ruecker',
-    slug: 'charles-ruecker',
-  },
-  {
-    id: '25983fa2-a861-46f3-9c71-124286de7367',
-    name: 'Caroline Pollich',
-    slug: 'caroline-pollich',
-  },
-  {
-    id: '687a0fcb-531d-42c1-8854-a47dc59f61e7',
-    name: 'Dr. Darryl Rath',
-    slug: 'dr-darryl-rath',
-  },
-  {
-    id: 'd0ecaa07-0ba1-4deb-ac6f-1dc01cdd6174',
-    name: 'Isaac Purdy MD',
-    slug: 'isaac-purdy-md',
-  },
-  {
-    id: 'c0846aa5-7f3e-44d9-89db-bef675cac431',
-    name: 'Nichole Schamberger',
-    slug: 'nichole-schamberger',
-  },
-  {
-    id: 'u6',
-    name: 'Louie',
-    slug: 'louie',
-  },
-  {
-    id: 'u1',
-    name: 'Peter Lustig',
-    slug: 'peter-lustig',
-  },
-  {
-    id: '6de37964-e79b-4be4-b384-ed571c37a31e',
-    name: 'Mr. Oliver Quitzon',
-    slug: 'mr-oliver-quitzon',
-  },
-  {
-    id: '96446bee-ce95-47d6-acc1-742c70d21518',
-    name: 'Myrtle Williamson',
-    slug: 'myrtle-williamson',
-  },
-  {
-    id: '9e58bc8d-d63a-4b03-92df-fb540ff8b2ce',
-    name: 'Andy Stracke',
-    slug: 'andy-stracke',
-  },
-  {
-    id: 'd808b58b-b097-4614-a2c5-81187e9884ca',
-    name: 'Warren Crist',
-    slug: 'warren-crist',
-  },
-  {
-    id: 'ff800e3a-ceba-44e9-904b-458c20e518ff',
-    name: 'Dolores Wilkinson V',
-    slug: 'dolores-wilkinson-v',
-  },
-]
+additionalConnections = {
+  followedBy: [
+    {
+      id: '9f305e7a-ae5a-4e22-8269-8b6899af674f',
+      name: 'Hugh Harris Sr.',
+      slug: 'hugh-harris-sr',
+    },
+    {
+      id: '69dbad2b-5749-4697-9976-221992439086',
+      name: 'Ashley Fisher',
+      slug: 'ashley-fisher',
+    },
+    {
+      id: 'eec8ee9e-ee4e-4b83-b655-a106eb857611',
+      name: 'Devin Reynolds',
+      slug: 'devin-reynolds',
+    },
+    {
+      id: 'f638fad4-73c2-4bc9-ae4e-2e53035397e9',
+      name: 'Sophia Jaskolski',
+      slug: 'sophia-jaskolski',
+    },
+    {
+      id: '61040fdf-da6a-489e-b79c-45f58d33386f',
+      name: 'Rodolfo Lind',
+      slug: 'rodolfo-lind',
+    },
+    {
+      id: 'a09a2341-0575-4235-96c6-2ebc7d77de3f',
+      name: 'Phil Dare',
+      slug: 'phil-dare',
+    },
+    {
+      id: 'c5f7eea9-ee4b-4384-91cd-b6c7d128f122',
+      name: 'Omar Turcotte',
+      slug: 'omar-turcotte',
+    },
+    {
+      id: '036cae06-5c8f-4ffb-923e-73b2baba1a00',
+      name: 'Rosemary Wiegand',
+      slug: 'rosemary-wiegand',
+    },
+    {
+      id: '9011b4fd-feec-4b74-b6d0-e0a41b6658e6',
+      name: 'Lela Kautzer',
+      slug: 'lela-kautzer',
+    },
+    {
+      id: '019a48f6-5785-4c5c-a2ac-7cb80007aa41',
+      name: 'Roosevelt Lindgren III',
+      slug: 'roosevelt-lindgren-iii',
+    },
+    {
+      id: '3a089655-19c8-478f-97c1-345b3dfc95a3',
+      name: 'Lee Erdman',
+      slug: 'lee-erdman',
+    },
+    {
+      id: '8af5df96-8c09-4fe4-a9cd-572840c94529',
+      name: 'Mamie Conn',
+      slug: 'mamie-conn',
+    },
+    {
+      id: 'ca1b7bcb-1254-43ff-90a1-b0e6d49c31bc',
+      name: 'Sergio Casper',
+      slug: 'sergio-casper',
+    },
+    {
+      id: '4c11e030-0419-43a0-8d7a-dc198b57efd7',
+      name: 'Charles Ruecker',
+      slug: 'charles-ruecker',
+    },
+    {
+      id: '25983fa2-a861-46f3-9c71-124286de7367',
+      name: 'Caroline Pollich',
+      slug: 'caroline-pollich',
+    },
+    {
+      id: '687a0fcb-531d-42c1-8854-a47dc59f61e7',
+      name: 'Dr. Darryl Rath',
+      slug: 'dr-darryl-rath',
+    },
+    {
+      id: 'd0ecaa07-0ba1-4deb-ac6f-1dc01cdd6174',
+      name: 'Isaac Purdy MD',
+      slug: 'isaac-purdy-md',
+    },
+    {
+      id: 'c0846aa5-7f3e-44d9-89db-bef675cac431',
+      name: 'Nichole Schamberger',
+      slug: 'nichole-schamberger',
+    },
+    {
+      id: 'u6',
+      name: 'Louie',
+      slug: 'louie',
+    },
+    {
+      id: 'u1',
+      name: 'Peter Lustig',
+      slug: 'peter-lustig',
+    },
+    {
+      id: '6de37964-e79b-4be4-b384-ed571c37a31e',
+      name: 'Mr. Oliver Quitzon',
+      slug: 'mr-oliver-quitzon',
+    },
+    {
+      id: '96446bee-ce95-47d6-acc1-742c70d21518',
+      name: 'Myrtle Williamson',
+      slug: 'myrtle-williamson',
+    },
+    {
+      id: '9e58bc8d-d63a-4b03-92df-fb540ff8b2ce',
+      name: 'Andy Stracke',
+      slug: 'andy-stracke',
+    },
+    {
+      id: 'd808b58b-b097-4614-a2c5-81187e9884ca',
+      name: 'Warren Crist',
+      slug: 'warren-crist',
+    },
+    {
+      id: 'ff800e3a-ceba-44e9-904b-458c20e518ff',
+      name: 'Dolores Wilkinson V',
+      slug: 'dolores-wilkinson-v',
+    },
+  ],
 
-const additionalFollowing = [
-  {
-    id: '9011b4fd-feec-4b74-b6d0-e0a41b6658e6',
-    name: 'Lela Kautzer',
-    slug: 'lela-kautzer',
-  },
-  {
-    id: '61040fdf-da6a-489e-b79c-45f58d33386f',
-    name: 'Rodolfo Lind',
-    slug: 'rodolfo-lind',
-  },
-  {
-    id: '3a089655-19c8-478f-97c1-345b3dfc95a3',
-    name: 'Lee Erdman',
-    slug: 'lee-erdman',
-  },
-  {
-    id: 'c5f7eea9-ee4b-4384-91cd-b6c7d128f122',
-    name: 'Omar Turcotte',
-    slug: 'omar-turcotte',
-  },
-  {
-    id: 'f638fad4-73c2-4bc9-ae4e-2e53035397e9',
-    name: 'Sophia Jaskolski',
-    slug: 'sophia-jaskolski',
-  },
-  {
-    id: 'u4',
-    name: 'Huey',
-    slug: 'huey',
-  },
-  {
-    id: '6de37964-e79b-4be4-b384-ed571c37a31e',
-    name: 'Mr. Oliver Quitzon',
-    slug: 'mr-oliver-quitzon',
-  },
-  {
-    id: 'd3d43b17-e7bb-4778-a373-798df58a9a5f',
-    name: 'Ms. Rita Thompson',
-    slug: 'ms-rita-thompson',
-  },
-  {
-    id: '036cae06-5c8f-4ffb-923e-73b2baba1a00',
-    name: 'Rosemary Wiegand',
-    slug: 'rosemary-wiegand',
-  },
-  {
-    id: 'eec8ee9e-ee4e-4b83-b655-a106eb857611',
-    name: 'Devin Reynolds',
-    slug: 'devin-reynolds',
-  },
-  {
-    id: '96446bee-ce95-47d6-acc1-742c70d21518',
-    name: 'Myrtle Williamson',
-    slug: 'myrtle-williamson',
-  },
-  {
-    id: '9f305e7a-ae5a-4e22-8269-8b6899af674f',
-    name: 'Hugh Harris Sr.',
-    slug: 'hugh-harris-sr',
-  },
-  {
-    id: 'c0846aa5-7f3e-44d9-89db-bef675cac431',
-    name: 'Nichole Schamberger',
-    slug: 'nichole-schamberger',
-  },
-  {
-    id: '019a48f6-5785-4c5c-a2ac-7cb80007aa41',
-    name: 'Roosevelt Lindgren III',
-    slug: 'roosevelt-lindgren-iii',
-  },
-  {
-    id: 'ff800e3a-ceba-44e9-904b-458c20e518ff',
-    name: 'Dolores Wilkinson V',
-    slug: 'dolores-wilkinson-v',
-  },
-  {
-    id: '9e58bc8d-d63a-4b03-92df-fb540ff8b2ce',
-    name: 'Andy Stracke',
-    slug: 'andy-stracke',
-  },
-  {
-    id: 'd808b58b-b097-4614-a2c5-81187e9884ca',
-    name: 'Warren Crist',
-    slug: 'warren-crist',
-  },
-  {
-    id: '45313bea-9152-4c8d-9c6e-1eca029979f8',
-    name: 'Jeremiah Breitenberg',
-    slug: 'jeremiah-breitenberg',
-  },
-  {
-    id: '8af5df96-8c09-4fe4-a9cd-572840c94529',
-    name: 'Mamie Conn',
-    slug: 'mamie-conn',
-  },
-  {
-    id: '4c11e030-0419-43a0-8d7a-dc198b57efd7',
-    name: 'Charles Ruecker',
-    slug: 'charles-ruecker',
-  },
-  {
-    id: '687a0fcb-531d-42c1-8854-a47dc59f61e7',
-    name: 'Dr. Darryl Rath',
-    slug: 'dr-darryl-rath',
-  },
-  {
-    id: 'ca1b7bcb-1254-43ff-90a1-b0e6d49c31bc',
-    name: 'Sergio Casper',
-    slug: 'sergio-casper',
-  },
-  {
-    id: '25983fa2-a861-46f3-9c71-124286de7367',
-    name: 'Caroline Pollich',
-    slug: 'caroline-pollich',
-  },
-  {
-    id: 'd0ecaa07-0ba1-4deb-ac6f-1dc01cdd6174',
-    name: 'Isaac Purdy MD',
-    slug: 'isaac-purdy-md',
-  },
-]
+  following: [
+    {
+      id: '9011b4fd-feec-4b74-b6d0-e0a41b6658e6',
+      name: 'Lela Kautzer',
+      slug: 'lela-kautzer',
+    },
+    {
+      id: '61040fdf-da6a-489e-b79c-45f58d33386f',
+      name: 'Rodolfo Lind',
+      slug: 'rodolfo-lind',
+    },
+    {
+      id: '3a089655-19c8-478f-97c1-345b3dfc95a3',
+      name: 'Lee Erdman',
+      slug: 'lee-erdman',
+    },
+    {
+      id: 'c5f7eea9-ee4b-4384-91cd-b6c7d128f122',
+      name: 'Omar Turcotte',
+      slug: 'omar-turcotte',
+    },
+    {
+      id: 'f638fad4-73c2-4bc9-ae4e-2e53035397e9',
+      name: 'Sophia Jaskolski',
+      slug: 'sophia-jaskolski',
+    },
+    {
+      id: 'u4',
+      name: 'Huey',
+      slug: 'huey',
+    },
+    {
+      id: '6de37964-e79b-4be4-b384-ed571c37a31e',
+      name: 'Mr. Oliver Quitzon',
+      slug: 'mr-oliver-quitzon',
+    },
+    {
+      id: 'd3d43b17-e7bb-4778-a373-798df58a9a5f',
+      name: 'Ms. Rita Thompson',
+      slug: 'ms-rita-thompson',
+    },
+    {
+      id: '036cae06-5c8f-4ffb-923e-73b2baba1a00',
+      name: 'Rosemary Wiegand',
+      slug: 'rosemary-wiegand',
+    },
+    {
+      id: 'eec8ee9e-ee4e-4b83-b655-a106eb857611',
+      name: 'Devin Reynolds',
+      slug: 'devin-reynolds',
+    },
+    {
+      id: '96446bee-ce95-47d6-acc1-742c70d21518',
+      name: 'Myrtle Williamson',
+      slug: 'myrtle-williamson',
+    },
+    {
+      id: '9f305e7a-ae5a-4e22-8269-8b6899af674f',
+      name: 'Hugh Harris Sr.',
+      slug: 'hugh-harris-sr',
+    },
+    {
+      id: 'c0846aa5-7f3e-44d9-89db-bef675cac431',
+      name: 'Nichole Schamberger',
+      slug: 'nichole-schamberger',
+    },
+    {
+      id: '019a48f6-5785-4c5c-a2ac-7cb80007aa41',
+      name: 'Roosevelt Lindgren III',
+      slug: 'roosevelt-lindgren-iii',
+    },
+    {
+      id: 'ff800e3a-ceba-44e9-904b-458c20e518ff',
+      name: 'Dolores Wilkinson V',
+      slug: 'dolores-wilkinson-v',
+    },
+    {
+      id: '9e58bc8d-d63a-4b03-92df-fb540ff8b2ce',
+      name: 'Andy Stracke',
+      slug: 'andy-stracke',
+    },
+    {
+      id: 'd808b58b-b097-4614-a2c5-81187e9884ca',
+      name: 'Warren Crist',
+      slug: 'warren-crist',
+    },
+    {
+      id: '45313bea-9152-4c8d-9c6e-1eca029979f8',
+      name: 'Jeremiah Breitenberg',
+      slug: 'jeremiah-breitenberg',
+    },
+    {
+      id: '8af5df96-8c09-4fe4-a9cd-572840c94529',
+      name: 'Mamie Conn',
+      slug: 'mamie-conn',
+    },
+    {
+      id: '4c11e030-0419-43a0-8d7a-dc198b57efd7',
+      name: 'Charles Ruecker',
+      slug: 'charles-ruecker',
+    },
+    {
+      id: '687a0fcb-531d-42c1-8854-a47dc59f61e7',
+      name: 'Dr. Darryl Rath',
+      slug: 'dr-darryl-rath',
+    },
+    {
+      id: 'ca1b7bcb-1254-43ff-90a1-b0e6d49c31bc',
+      name: 'Sergio Casper',
+      slug: 'sergio-casper',
+    },
+    {
+      id: '25983fa2-a861-46f3-9c71-124286de7367',
+      name: 'Caroline Pollich',
+      slug: 'caroline-pollich',
+    },
+    {
+      id: 'd0ecaa07-0ba1-4deb-ac6f-1dc01cdd6174',
+      name: 'Isaac Purdy MD',
+      slug: 'isaac-purdy-md',
+    },
+  ],
+}
diff --git a/webapp/components/features/FollowList.vue b/webapp/components/features/FollowList.vue
index e06b7108a..0c21c6058 100644
--- a/webapp/components/features/FollowList.vue
+++ b/webapp/components/features/FollowList.vue
@@ -12,14 +12,14 @@
           <user-teaser :user="follow" />
         </client-only>
       </ds-space>
-      <ds-space v-if="this.user.followedByCount - this.connections.length" margin="small">
-        <ds-text size="small" color="soft">
-        {{
-          $t('profile.network.andMore', {
-            number: this.user.followedByCount - this.connections.length,
-          })
-        }}
-        </ds-text>
+      <ds-space v-if="this.counts[this.type] - this.connections.length" margin="small">
+        <base-button @click="fetchConnections" size="small" color="softer">
+          {{
+            $t('profile.network.andMore', {
+              number: this.counts[this.type] - this.connections.length,
+            })
+          }}
+        </base-button>
       </ds-space>
     </template>
     <template v-else>
@@ -34,8 +34,7 @@
 import uniqBy from 'lodash/uniqBy'
 import UserAvatar from '~/components/_new/generic/UserAvatar/UserAvatar'
 import UserTeaser from '~/components/UserTeaser/UserTeaser'
-
-let expanded = false
+import { followedByQuery, followingQuery } from '~/graphql/User'
 
 export default {
   name: 'FollowerList',
@@ -50,6 +49,14 @@ export default {
   data() {
     return {
       connections: this.user[this.type],
+      queries: {
+        followedBy: followedByQuery,
+        following: followingQuery,
+      },
+      counts: {
+        followedBy: this.user.followedByCount,
+        following: this.user.followingCount,
+      },
     }
   },
   computed: {
@@ -62,6 +69,16 @@ export default {
     uniq(items, field = 'id') {
       return uniqBy(items, field)
     },
+    async fetchConnections() {
+      const query = this.queries[this.type]
+      const { data } = await this.$apollo.query({
+        query: this.queries[this.type],
+        variables: { id: this.user.id },
+        // neither result nor update are being called when defined here (?)
+      })
+      const connections = data.User[0][this.type]
+      this.connections = this.connections.concat(connections)
+    },
   },
 }
 </script>
diff --git a/webapp/graphql/User.js b/webapp/graphql/User.js
index aeb6ae729..e1f119f5c 100644
--- a/webapp/graphql/User.js
+++ b/webapp/graphql/User.js
@@ -283,3 +283,28 @@ export const currentUserQuery = gql`
     }
   }
 `
+
+export const followedByQuery = gql`
+  query($id: ID!) {
+    User(id: $id) {
+      followedBy(offset: 7) {
+        id
+        slug
+        name
+      }
+    }
+  }
+`
+
+export const followingQuery = gql`
+  query($id: ID!) {
+    User(id: $id) {
+      following(offset: 7) {
+        id
+        slug
+        name
+      }
+    }
+  }
+`
+

From 984f69a738d872a76dfd907374b388205b323998 Mon Sep 17 00:00:00 2001
From: Raphael Beer <raphael.beer@protonmail.com>
Date: Thu, 19 Mar 2020 01:58:28 +0100
Subject: [PATCH 04/54] Chore: lint

---
 webapp/components/features/FollowList.spec.js |  6 ++----
 webapp/components/features/FollowList.vue     | 12 +++---------
 webapp/graphql/User.js                        |  1 -
 webapp/pages/profile/_id/_slug.vue            |  2 --
 4 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/webapp/components/features/FollowList.spec.js b/webapp/components/features/FollowList.spec.js
index 43778cf77..571fc993e 100644
--- a/webapp/components/features/FollowList.spec.js
+++ b/webapp/components/features/FollowList.spec.js
@@ -8,8 +8,6 @@ config.stubs['client-only'] = '<span><slot /></span>'
 config.stubs['ds-space'] = '<span><slot /></span>'
 config.stubs['nuxt-link'] = '<span><slot /></span>'
 
-let user, additionalConnections
-
 describe('FollowList.vue', () => {
   let store, mocks, getters, propsData
 
@@ -75,7 +73,7 @@ describe('FollowList.vue', () => {
   })
 })
 
-user = {
+const user = {
   name: 'Jenny Rostock',
   id: 'u3',
   followedByCount: 32,
@@ -156,7 +154,7 @@ user = {
   ],
 }
 
-additionalConnections = {
+const additionalConnections = {
   followedBy: [
     {
       id: '9f305e7a-ae5a-4e22-8269-8b6899af674f',
diff --git a/webapp/components/features/FollowList.vue b/webapp/components/features/FollowList.vue
index 0c21c6058..c46b4ca6a 100644
--- a/webapp/components/features/FollowList.vue
+++ b/webapp/components/features/FollowList.vue
@@ -12,11 +12,11 @@
           <user-teaser :user="follow" />
         </client-only>
       </ds-space>
-      <ds-space v-if="this.counts[this.type] - this.connections.length" margin="small">
+      <ds-space v-if="this.allConnectionsCount - this.connections.length" margin="small">
         <base-button @click="fetchConnections" size="small" color="softer">
           {{
             $t('profile.network.andMore', {
-              number: this.counts[this.type] - this.connections.length,
+              number: this.allConnectionsCount - this.connections.length,
             })
           }}
         </base-button>
@@ -32,14 +32,12 @@
 
 <script>
 import uniqBy from 'lodash/uniqBy'
-import UserAvatar from '~/components/_new/generic/UserAvatar/UserAvatar'
 import UserTeaser from '~/components/UserTeaser/UserTeaser'
 import { followedByQuery, followingQuery } from '~/graphql/User'
 
 export default {
   name: 'FollowerList',
   components: {
-    UserAvatar,
     UserTeaser,
   },
   props: {
@@ -49,14 +47,11 @@ export default {
   data() {
     return {
       connections: this.user[this.type],
+      allConnectionsCount: this.user[`${this.type}Count`],
       queries: {
         followedBy: followedByQuery,
         following: followingQuery,
       },
-      counts: {
-        followedBy: this.user.followedByCount,
-        following: this.user.followingCount,
-      },
     }
   },
   computed: {
@@ -70,7 +65,6 @@ export default {
       return uniqBy(items, field)
     },
     async fetchConnections() {
-      const query = this.queries[this.type]
       const { data } = await this.$apollo.query({
         query: this.queries[this.type],
         variables: { id: this.user.id },
diff --git a/webapp/graphql/User.js b/webapp/graphql/User.js
index e1f119f5c..1e9e40ce6 100644
--- a/webapp/graphql/User.js
+++ b/webapp/graphql/User.js
@@ -307,4 +307,3 @@ export const followingQuery = gql`
     }
   }
 `
-
diff --git a/webapp/pages/profile/_id/_slug.vue b/webapp/pages/profile/_id/_slug.vue
index 37ce43892..e9cb6e9fc 100644
--- a/webapp/pages/profile/_id/_slug.vue
+++ b/webapp/pages/profile/_id/_slug.vue
@@ -215,7 +215,6 @@
 
 <script>
 import uniqBy from 'lodash/uniqBy'
-import UserTeaser from '~/components/UserTeaser/UserTeaser'
 import PostTeaser from '~/components/PostTeaser/PostTeaser.vue'
 import HcFollowButton from '~/components/FollowButton.vue'
 import HcCountTo from '~/components/CountTo.vue'
@@ -244,7 +243,6 @@ const tabToFilterMapping = ({ tab, id }) => {
 
 export default {
   components: {
-    UserTeaser,
     PostTeaser,
     HcFollowButton,
     HcCountTo,

From 37ed748b29edd0c92d74a6f64f1586dd242359af Mon Sep 17 00:00:00 2001
From: Raphael Beer <raphael.beer@protonmail.com>
Date: Thu, 19 Mar 2020 06:28:43 +0100
Subject: [PATCH 05/54] Fix: not updating on user prop change, translation keys

---
 webapp/components/features/FollowList.vue | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/webapp/components/features/FollowList.vue b/webapp/components/features/FollowList.vue
index c46b4ca6a..7ba364a97 100644
--- a/webapp/components/features/FollowList.vue
+++ b/webapp/components/features/FollowList.vue
@@ -2,7 +2,7 @@
   <base-card style="position: relative; height: auto;">
     <ds-space v-if="this.connections && this.connections.length" margin="x-small">
       <ds-text tag="h5" color="soft">
-        {{ userName | truncate(15) }} {{ $t('profile.network.following') }}
+        {{ userName | truncate(15) }} {{ $t(`profile.network.${type}`) }}
       </ds-text>
     </ds-space>
     <template v-if="this.connections && this.connections.length">
@@ -24,7 +24,7 @@
     </template>
     <template v-else>
       <p style="text-align: center; opacity: .5;">
-        {{ userName }} {{ $t('profile.network.followingNobody') }}
+        {{ userName }} {{ $t(`profile.network.${type}Nobody`) }}
       </p>
     </template>
   </base-card>
@@ -46,8 +46,7 @@ export default {
   },
   data() {
     return {
-      connections: this.user[this.type],
-      allConnectionsCount: this.user[`${this.type}Count`],
+      additionalConnections: [],
       queries: {
         followedBy: followedByQuery,
         following: followingQuery,
@@ -59,6 +58,12 @@ export default {
       const { name } = this.user || {}
       return name || this.$t('profile.userAnonym')
     },
+    connections() {
+      return [...this.user[this.type], ...this.additionalConnections]
+    },
+    allConnectionsCount() {
+      return this.user[`${this.type}Count`]
+    },
   },
   methods: {
     uniq(items, field = 'id') {
@@ -70,8 +75,7 @@ export default {
         variables: { id: this.user.id },
         // neither result nor update are being called when defined here (?)
       })
-      const connections = data.User[0][this.type]
-      this.connections = this.connections.concat(connections)
+      this.additionalConnections = data.User[0][this.type]
     },
   },
 }

From 801eb1e515ff87cac8a68fac5da5a1d5f0cad4d6 Mon Sep 17 00:00:00 2001
From: Raphael Beer <raphael.beer@protonmail.com>
Date: Thu, 19 Mar 2020 07:30:09 +0100
Subject: [PATCH 06/54] Fix: missing stub in _id/_slug spec

---
 webapp/components/features/FollowList.spec.js | 188 +-----------------
 webapp/pages/profile/_id/_slug.spec.js        |   2 +
 2 files changed, 6 insertions(+), 184 deletions(-)

diff --git a/webapp/components/features/FollowList.spec.js b/webapp/components/features/FollowList.spec.js
index 571fc993e..0ba253734 100644
--- a/webapp/components/features/FollowList.spec.js
+++ b/webapp/components/features/FollowList.spec.js
@@ -60,12 +60,12 @@ describe('FollowList.vue', () => {
           })
           it(`has a button to load all remaining users ${type}`, async () => {
             wrapper.find('button').trigger('click')
-            await wrapper.vm.$nextTick()
+            //await wrapper.vm.$nextTick()
+            //expect(wrapper.vm.connections.length).toBe(user[`${type}Count`])
             expect(queryMock).toHaveBeenCalledWith({
               query: wrapper.vm.queries[type],
               variables: { id: user.id },
             })
-            expect(wrapper.vm.connections.length).toBe(user[`${type}Count`])
           })
         }),
       )
@@ -76,8 +76,8 @@ describe('FollowList.vue', () => {
 const user = {
   name: 'Jenny Rostock',
   id: 'u3',
-  followedByCount: 32,
-  followingCount: 31,
+  followedByCount: 12,
+  followingCount: 15,
   followedBy: [
     {
       id: '2877b626-bac0-43df-b2bf-4ee025ba38b2',
@@ -181,106 +181,6 @@ const additionalConnections = {
       name: 'Rodolfo Lind',
       slug: 'rodolfo-lind',
     },
-    {
-      id: 'a09a2341-0575-4235-96c6-2ebc7d77de3f',
-      name: 'Phil Dare',
-      slug: 'phil-dare',
-    },
-    {
-      id: 'c5f7eea9-ee4b-4384-91cd-b6c7d128f122',
-      name: 'Omar Turcotte',
-      slug: 'omar-turcotte',
-    },
-    {
-      id: '036cae06-5c8f-4ffb-923e-73b2baba1a00',
-      name: 'Rosemary Wiegand',
-      slug: 'rosemary-wiegand',
-    },
-    {
-      id: '9011b4fd-feec-4b74-b6d0-e0a41b6658e6',
-      name: 'Lela Kautzer',
-      slug: 'lela-kautzer',
-    },
-    {
-      id: '019a48f6-5785-4c5c-a2ac-7cb80007aa41',
-      name: 'Roosevelt Lindgren III',
-      slug: 'roosevelt-lindgren-iii',
-    },
-    {
-      id: '3a089655-19c8-478f-97c1-345b3dfc95a3',
-      name: 'Lee Erdman',
-      slug: 'lee-erdman',
-    },
-    {
-      id: '8af5df96-8c09-4fe4-a9cd-572840c94529',
-      name: 'Mamie Conn',
-      slug: 'mamie-conn',
-    },
-    {
-      id: 'ca1b7bcb-1254-43ff-90a1-b0e6d49c31bc',
-      name: 'Sergio Casper',
-      slug: 'sergio-casper',
-    },
-    {
-      id: '4c11e030-0419-43a0-8d7a-dc198b57efd7',
-      name: 'Charles Ruecker',
-      slug: 'charles-ruecker',
-    },
-    {
-      id: '25983fa2-a861-46f3-9c71-124286de7367',
-      name: 'Caroline Pollich',
-      slug: 'caroline-pollich',
-    },
-    {
-      id: '687a0fcb-531d-42c1-8854-a47dc59f61e7',
-      name: 'Dr. Darryl Rath',
-      slug: 'dr-darryl-rath',
-    },
-    {
-      id: 'd0ecaa07-0ba1-4deb-ac6f-1dc01cdd6174',
-      name: 'Isaac Purdy MD',
-      slug: 'isaac-purdy-md',
-    },
-    {
-      id: 'c0846aa5-7f3e-44d9-89db-bef675cac431',
-      name: 'Nichole Schamberger',
-      slug: 'nichole-schamberger',
-    },
-    {
-      id: 'u6',
-      name: 'Louie',
-      slug: 'louie',
-    },
-    {
-      id: 'u1',
-      name: 'Peter Lustig',
-      slug: 'peter-lustig',
-    },
-    {
-      id: '6de37964-e79b-4be4-b384-ed571c37a31e',
-      name: 'Mr. Oliver Quitzon',
-      slug: 'mr-oliver-quitzon',
-    },
-    {
-      id: '96446bee-ce95-47d6-acc1-742c70d21518',
-      name: 'Myrtle Williamson',
-      slug: 'myrtle-williamson',
-    },
-    {
-      id: '9e58bc8d-d63a-4b03-92df-fb540ff8b2ce',
-      name: 'Andy Stracke',
-      slug: 'andy-stracke',
-    },
-    {
-      id: 'd808b58b-b097-4614-a2c5-81187e9884ca',
-      name: 'Warren Crist',
-      slug: 'warren-crist',
-    },
-    {
-      id: 'ff800e3a-ceba-44e9-904b-458c20e518ff',
-      name: 'Dolores Wilkinson V',
-      slug: 'dolores-wilkinson-v',
-    },
   ],
 
   following: [
@@ -324,85 +224,5 @@ const additionalConnections = {
       name: 'Ms. Rita Thompson',
       slug: 'ms-rita-thompson',
     },
-    {
-      id: '036cae06-5c8f-4ffb-923e-73b2baba1a00',
-      name: 'Rosemary Wiegand',
-      slug: 'rosemary-wiegand',
-    },
-    {
-      id: 'eec8ee9e-ee4e-4b83-b655-a106eb857611',
-      name: 'Devin Reynolds',
-      slug: 'devin-reynolds',
-    },
-    {
-      id: '96446bee-ce95-47d6-acc1-742c70d21518',
-      name: 'Myrtle Williamson',
-      slug: 'myrtle-williamson',
-    },
-    {
-      id: '9f305e7a-ae5a-4e22-8269-8b6899af674f',
-      name: 'Hugh Harris Sr.',
-      slug: 'hugh-harris-sr',
-    },
-    {
-      id: 'c0846aa5-7f3e-44d9-89db-bef675cac431',
-      name: 'Nichole Schamberger',
-      slug: 'nichole-schamberger',
-    },
-    {
-      id: '019a48f6-5785-4c5c-a2ac-7cb80007aa41',
-      name: 'Roosevelt Lindgren III',
-      slug: 'roosevelt-lindgren-iii',
-    },
-    {
-      id: 'ff800e3a-ceba-44e9-904b-458c20e518ff',
-      name: 'Dolores Wilkinson V',
-      slug: 'dolores-wilkinson-v',
-    },
-    {
-      id: '9e58bc8d-d63a-4b03-92df-fb540ff8b2ce',
-      name: 'Andy Stracke',
-      slug: 'andy-stracke',
-    },
-    {
-      id: 'd808b58b-b097-4614-a2c5-81187e9884ca',
-      name: 'Warren Crist',
-      slug: 'warren-crist',
-    },
-    {
-      id: '45313bea-9152-4c8d-9c6e-1eca029979f8',
-      name: 'Jeremiah Breitenberg',
-      slug: 'jeremiah-breitenberg',
-    },
-    {
-      id: '8af5df96-8c09-4fe4-a9cd-572840c94529',
-      name: 'Mamie Conn',
-      slug: 'mamie-conn',
-    },
-    {
-      id: '4c11e030-0419-43a0-8d7a-dc198b57efd7',
-      name: 'Charles Ruecker',
-      slug: 'charles-ruecker',
-    },
-    {
-      id: '687a0fcb-531d-42c1-8854-a47dc59f61e7',
-      name: 'Dr. Darryl Rath',
-      slug: 'dr-darryl-rath',
-    },
-    {
-      id: 'ca1b7bcb-1254-43ff-90a1-b0e6d49c31bc',
-      name: 'Sergio Casper',
-      slug: 'sergio-casper',
-    },
-    {
-      id: '25983fa2-a861-46f3-9c71-124286de7367',
-      name: 'Caroline Pollich',
-      slug: 'caroline-pollich',
-    },
-    {
-      id: 'd0ecaa07-0ba1-4deb-ac6f-1dc01cdd6174',
-      name: 'Isaac Purdy MD',
-      slug: 'isaac-purdy-md',
-    },
   ],
 }
diff --git a/webapp/pages/profile/_id/_slug.spec.js b/webapp/pages/profile/_id/_slug.spec.js
index 0dfc87b85..b4e3c3115 100644
--- a/webapp/pages/profile/_id/_slug.spec.js
+++ b/webapp/pages/profile/_id/_slug.spec.js
@@ -9,6 +9,8 @@ config.stubs['client-only'] = '<span><slot /></span>'
 config.stubs['v-popover'] = '<span><slot /></span>'
 config.stubs['nuxt-link'] = '<span><slot /></span>'
 config.stubs['infinite-loading'] = '<span><slot /></span>'
+config.stubs['follow-list'] = '<span><slot /></span>'
+
 
 describe('ProfileSlug', () => {
   let wrapper

From 0b916012e81f297db7701321d5753517589a98f5 Mon Sep 17 00:00:00 2001
From: Raphael Beer <raphael.beer@protonmail.com>
Date: Mon, 23 Mar 2020 12:45:55 +0100
Subject: [PATCH 07/54] Fix: Vue's nextTick doesn't wait for jest mocks to
 resolve

---
 webapp/components/features/FollowList.spec.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/webapp/components/features/FollowList.spec.js b/webapp/components/features/FollowList.spec.js
index 0ba253734..602d004bc 100644
--- a/webapp/components/features/FollowList.spec.js
+++ b/webapp/components/features/FollowList.spec.js
@@ -59,9 +59,14 @@ describe('FollowList.vue', () => {
             expect(wrapper.findAll('.user-teaser').length).toEqual(user[type].length)
           })
           it(`has a button to load all remaining users ${type}`, async () => {
+            jest.useFakeTimers()
+
             wrapper.find('button').trigger('click')
-            //await wrapper.vm.$nextTick()
-            //expect(wrapper.vm.connections.length).toBe(user[`${type}Count`])
+
+            await jest.runAllTicks()
+            await wrapper.vm.$nextTick()
+
+            expect(wrapper.vm.connections.length).toBe(user[`${type}Count`])
             expect(queryMock).toHaveBeenCalledWith({
               query: wrapper.vm.queries[type],
               variables: { id: user.id },

From bf7bd6fd59f629f20f5f920fdf0435efd62f785b Mon Sep 17 00:00:00 2001
From: Raphael Beer <raphael.beer@protonmail.com>
Date: Mon, 23 Mar 2020 12:51:14 +0100
Subject: [PATCH 08/54] [wip|rebase]: lint

---
 webapp/components/features/FollowList.spec.js | 1 -
 webapp/pages/profile/_id/_slug.spec.js        | 1 -
 2 files changed, 2 deletions(-)

diff --git a/webapp/components/features/FollowList.spec.js b/webapp/components/features/FollowList.spec.js
index 602d004bc..ba71e08f2 100644
--- a/webapp/components/features/FollowList.spec.js
+++ b/webapp/components/features/FollowList.spec.js
@@ -62,7 +62,6 @@ describe('FollowList.vue', () => {
             jest.useFakeTimers()
 
             wrapper.find('button').trigger('click')
-
             await jest.runAllTicks()
             await wrapper.vm.$nextTick()
 
diff --git a/webapp/pages/profile/_id/_slug.spec.js b/webapp/pages/profile/_id/_slug.spec.js
index b4e3c3115..477174485 100644
--- a/webapp/pages/profile/_id/_slug.spec.js
+++ b/webapp/pages/profile/_id/_slug.spec.js
@@ -11,7 +11,6 @@ config.stubs['nuxt-link'] = '<span><slot /></span>'
 config.stubs['infinite-loading'] = '<span><slot /></span>'
 config.stubs['follow-list'] = '<span><slot /></span>'
 
-
 describe('ProfileSlug', () => {
   let wrapper
   let Wrapper

From 5a2c8220af5279ec7fc4da04ae29ea27b158bc1c Mon Sep 17 00:00:00 2001
From: Raphael Beer <raphael.beer@protonmail.com>
Date: Tue, 24 Mar 2020 12:43:56 +0100
Subject: [PATCH 09/54] Add: overflow container when list has more than 7 items

---
 webapp/components/features/FollowList.spec.js |  7 +++++++
 webapp/components/features/FollowList.vue     | 18 +++++++++++++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/webapp/components/features/FollowList.spec.js b/webapp/components/features/FollowList.spec.js
index ba71e08f2..dfe03195d 100644
--- a/webapp/components/features/FollowList.spec.js
+++ b/webapp/components/features/FollowList.spec.js
@@ -58,6 +58,7 @@ describe('FollowList.vue', () => {
           it(`shows the users ${type}`, () => {
             expect(wrapper.findAll('.user-teaser').length).toEqual(user[type].length)
           })
+
           it(`has a button to load all remaining users ${type}`, async () => {
             jest.useFakeTimers()
 
@@ -74,6 +75,12 @@ describe('FollowList.vue', () => {
         }),
       )
     })
+    
+    describe('given more than 7 connections', () => {
+      it('displays them in an overflow container', () => {
+        wrapper.find('')
+      })
+    })
   })
 })
 
diff --git a/webapp/components/features/FollowList.vue b/webapp/components/features/FollowList.vue
index 7ba364a97..f66932c74 100644
--- a/webapp/components/features/FollowList.vue
+++ b/webapp/components/features/FollowList.vue
@@ -5,7 +5,7 @@
         {{ userName | truncate(15) }} {{ $t(`profile.network.${type}`) }}
       </ds-text>
     </ds-space>
-    <template v-if="this.connections && this.connections.length">
+    <template v-if="this.connections && this.connections.length <= 7">
       <ds-space v-for="follow in uniq(this.connections)" :key="follow.id" margin="x-small">
         <!-- TODO: find better solution for rendering errors -->
         <client-only>
@@ -22,6 +22,15 @@
         </base-button>
       </ds-space>
     </template>
+    <template v-else-if="this.connections.length > 7">
+      <div class="overflow-container">
+        <ds-space v-for="follow in uniq(this.connections)" :key="follow.id" margin="x-small">
+          <client-only>
+            <user-teaser :user="follow" />
+          </client-only>
+        </ds-space>
+      </div>
+    </template>
     <template v-else>
       <p style="text-align: center; opacity: .5;">
         {{ userName }} {{ $t(`profile.network.${type}Nobody`) }}
@@ -80,3 +89,10 @@ export default {
   },
 }
 </script>
+
+<style lang="scss">
+.overflow-container {
+  max-height: 350px;
+  overflow-y: auto;
+}
+</style>

From 15d5933821bf09be84b24084d967c8aef21f6502 Mon Sep 17 00:00:00 2001
From: Raphael Beer <raphael.beer@protonmail.com>
Date: Wed, 25 Mar 2020 08:12:58 +0100
Subject: [PATCH 10/54] Change: v-focus directive looking for input +

  Searches children and uses first <input> child.
  if target of v-focus is not instanceof HTMLInputElement

  Also, adds vue-directives to storybook and tests
---
 webapp/plugins/vue-directives.js | 9 ++++++++-
 webapp/storybook/helpers.js      | 4 +++-
 webapp/test/testSetup.js         | 2 ++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/webapp/plugins/vue-directives.js b/webapp/plugins/vue-directives.js
index 7f09b2fb0..43daed57e 100644
--- a/webapp/plugins/vue-directives.js
+++ b/webapp/plugins/vue-directives.js
@@ -7,7 +7,14 @@ export default ({ app }) => {
       // Focus the element
       Vue.nextTick(() => {
         if (binding.value !== false) {
-          el.focus()
+          let target = el
+          const isInput = target instanceof HTMLInputElement
+          if (!isInput) {
+            target = el.querySelector('input')
+          }
+          if (target && typeof target.focus === 'function') {
+            target.focus()
+          }
         }
       })
     },
diff --git a/webapp/storybook/helpers.js b/webapp/storybook/helpers.js
index 677a2bf94..b6abf4c99 100644
--- a/webapp/storybook/helpers.js
+++ b/webapp/storybook/helpers.js
@@ -3,6 +3,7 @@ import Vuex from 'vuex'
 import vuexI18n from 'vuex-i18n/dist/vuex-i18n.umd.js'
 import Styleguide from '@human-connection/styleguide'
 import Filters from '~/plugins/vue-filters'
+import Directives from '~/plugins/vue-directives'
 import IziToast from '~/plugins/izi-toast'
 import layout from './layout.vue'
 import locales from '~/locales/index.js'
@@ -15,6 +16,7 @@ const helpers = {
     Vue.use(Styleguide)
     Vue.use(Filters)
     Vue.use(IziToast)
+    Vue.use(Directives)
 
     Vue.use(vuexI18n.plugin, helpers.store)
     locales.forEach(({ code }) => {
@@ -38,7 +40,7 @@ const helpers = {
           isAdmin() {
             return true
           },
-          user(state) {
+          user() {
             return { id: '1', name: 'admin', slug: 'admin' }
           },
         },
diff --git a/webapp/test/testSetup.js b/webapp/test/testSetup.js
index 3e0a04645..1c93d14b5 100644
--- a/webapp/test/testSetup.js
+++ b/webapp/test/testSetup.js
@@ -5,6 +5,7 @@ import Styleguide from '@human-connection/styleguide'
 import BaseComponents from '~/plugins/base-components'
 import Filters from '~/plugins/vue-filters'
 import InfiniteLoading from '~/plugins/vue-infinite-loading'
+import Directives from '~/plugins/vue-directives'
 
 global.localVue = createLocalVue()
 
@@ -13,4 +14,5 @@ global.localVue.use(VTooltip)
 global.localVue.use(Styleguide)
 global.localVue.use(BaseComponents)
 global.localVue.use(Filters)
+global.localVue.use(Directives)
 global.localVue.use(InfiniteLoading)

From e2b9e90b77ce8188533d3723b04bc12d3dde0b5e Mon Sep 17 00:00:00 2001
From: Raphael Beer <raphael.beer@protonmail.com>
Date: Wed, 25 Mar 2020 08:17:43 +0100
Subject: [PATCH 11/54] Add: FollowList storybook

---
 .../components/features/FollowList.story.js   | 115 ++++++++++++++++++
 1 file changed, 115 insertions(+)
 create mode 100644 webapp/components/features/FollowList.story.js

diff --git a/webapp/components/features/FollowList.story.js b/webapp/components/features/FollowList.story.js
new file mode 100644
index 000000000..36a267071
--- /dev/null
+++ b/webapp/components/features/FollowList.story.js
@@ -0,0 +1,115 @@
+import { storiesOf } from '@storybook/vue'
+import { withA11y } from '@storybook/addon-a11y'
+
+import helpers from '~/storybook/helpers'
+import FollowList from './FollowList.vue'
+
+helpers.init()
+
+const sevenConnectionsUser = {
+  name: 'Jenny Rostock',
+  id: 'u3',
+  followedByCount: 12,
+  followedBy: [
+    {
+      id: '2877b626-bac0-43df-b2bf-4ee025ba38b2',
+      name: 'Kristina Beahan',
+      slug: 'kristina-beahan',
+    },
+    {
+      id: '16b8838d-cc9f-4d30-8601-e4dea77d2f02',
+      name: 'Rhonda Stokes',
+      slug: 'rhonda-stokes',
+    },
+    {
+      id: '47a9846a-87d4-43fa-bf81-51d21dc38ed3',
+      name: 'Benny Lang',
+      slug: 'benny-lang',
+    },
+    {
+      id: 'd3d43b17-e7bb-4778-a373-798df58a9a5f',
+      name: 'Ms. Rita Thompson',
+      slug: 'ms-rita-thompson',
+    },
+    {
+      id: '18a4827c-8b5f-4510-b6fe-09fe8688eed1',
+      name: 'Arthur Johns',
+      slug: 'arthur-johns',
+    },
+    {
+      id: '45313bea-9152-4c8d-9c6e-1eca029979f8',
+      name: 'Jeremiah Breitenberg',
+      slug: 'jeremiah-breitenberg',
+    },
+    {
+      id: 'cfaf1c25-f0ad-4bdf-82a3-e4d8d5e5093e',
+      name: 'Dominic Weimann Jr.',
+      slug: 'dominic-weimann-jr',
+    },
+  ],
+}
+
+const allConnectionsUser = {
+  ...sevenConnectionsUser,
+  followedBy: [
+    ...sevenConnectionsUser.followedBy,
+    {
+      id: '9f305e7a-ae5a-4e22-8269-8b6899af674f',
+      name: 'Hugh Harris Sr.',
+      slug: 'hugh-harris-sr',
+    },
+    {
+      id: '69dbad2b-5749-4697-9976-221992439086',
+      name: 'Ashley Fisher',
+      slug: 'ashley-fisher',
+    },
+    {
+      id: 'eec8ee9e-ee4e-4b83-b655-a106eb857611',
+      name: 'Devin Reynolds',
+      slug: 'devin-reynolds',
+    },
+    {
+      id: 'f638fad4-73c2-4bc9-ae4e-2e53035397e9',
+      name: 'Sophia Jaskolski',
+      slug: 'sophia-jaskolski',
+    },
+    {
+      id: '61040fdf-da6a-489e-b79c-45f58d33386f',
+      name: 'Rodolfo Lind',
+      slug: 'rodolfo-lind',
+    },
+  ],
+}
+
+storiesOf('FollowList', module)
+  .addDecorator(withA11y)
+  .addDecorator(helpers.layout)
+  .add('with up to 7 connections', () => {
+    const user = sevenConnectionsUser
+    return {
+      components: { FollowList },
+      store: helpers.store,
+      data() {
+        return {
+          user,
+        }
+      },
+
+      template: `<follow-list :user="user" type="followedBy" />`,
+    }
+  })
+
+  .add('with more than 7 connections', () => {
+    const user = allConnectionsUser
+    return {
+      components: { FollowList },
+      store: helpers.store,
+      data() {
+        return {
+          user,
+        }
+      },
+
+      template: `<follow-list :user="user" type="followedBy" />`,
+    }
+  })

From 76def5f9015b53bcedc22ea03bb4b3a19f129d26 Mon Sep 17 00:00:00 2001
From: Raphael Beer <raphael.beer@protonmail.com>
Date: Wed, 25 Mar 2020 08:18:33 +0100
Subject: [PATCH 12/54] Add: fuzzy FollowList filtering

---
 webapp/components/features/FollowList.spec.js |  8 +--
 webapp/components/features/FollowList.vue     | 50 +++++++++++++++++--
 2 files changed, 47 insertions(+), 11 deletions(-)

diff --git a/webapp/components/features/FollowList.spec.js b/webapp/components/features/FollowList.spec.js
index dfe03195d..ea9eeaa2f 100644
--- a/webapp/components/features/FollowList.spec.js
+++ b/webapp/components/features/FollowList.spec.js
@@ -32,7 +32,7 @@ describe('FollowList.vue', () => {
     })
 
     describe('given a user with connections', () => {
-      ;['following', 'followedBy'].forEach(type =>
+      ;['following', 'followedBy'].forEach((type) =>
         describe(`and type=${type}`, () => {
           let wrapper
           let queryMock
@@ -75,12 +75,6 @@ describe('FollowList.vue', () => {
         }),
       )
     })
-    
-    describe('given more than 7 connections', () => {
-      it('displays them in an overflow container', () => {
-        wrapper.find('')
-      })
-    })
   })
 })
 
diff --git a/webapp/components/features/FollowList.vue b/webapp/components/features/FollowList.vue
index f66932c74..b03c61a6c 100644
--- a/webapp/components/features/FollowList.vue
+++ b/webapp/components/features/FollowList.vue
@@ -1,10 +1,20 @@
 <template>
-  <base-card style="position: relative; height: auto;">
+  <base-card style="position: relative; height: 424px;">
     <ds-space v-if="this.connections && this.connections.length" margin="x-small">
       <ds-text tag="h5" color="soft">
         {{ userName | truncate(15) }} {{ $t(`profile.network.${type}`) }}
       </ds-text>
     </ds-space>
+    <ds-space v-if="this.connections && this.connections.length > 7" margin="x-small">
+      <ds-input
+        ref="filter"
+        @input.native="setFilter"
+        placeholder="filter"
+        v-focus="true"
+        size="small"
+        icon="filter"
+      />
+    </ds-space>
     <template v-if="this.connections && this.connections.length <= 7">
       <ds-space v-for="follow in uniq(this.connections)" :key="follow.id" margin="x-small">
         <!-- TODO: find better solution for rendering errors -->
@@ -24,7 +34,11 @@
     </template>
     <template v-else-if="this.connections.length > 7">
       <div class="overflow-container">
-        <ds-space v-for="follow in uniq(this.connections)" :key="follow.id" margin="x-small">
+        <ds-space
+          v-for="follow in uniq(this.filteredConnections)"
+          :key="follow.id"
+          margin="x-small"
+        >
           <client-only>
             <user-teaser :user="follow" />
           </client-only>
@@ -32,7 +46,7 @@
       </div>
     </template>
     <template v-else>
-      <p style="text-align: center; opacity: .5;">
+      <p style="text-align: center; opacity: 0.5;">
         {{ userName }} {{ $t(`profile.network.${type}Nobody`) }}
       </p>
     </template>
@@ -56,6 +70,7 @@ export default {
   data() {
     return {
       additionalConnections: [],
+      filter: null,
       queries: {
         followedBy: followedByQuery,
         following: followingQuery,
@@ -70,6 +85,30 @@ export default {
     connections() {
       return [...this.user[this.type], ...this.additionalConnections]
     },
+    filteredConnections() {
+      if (!this.filter) {
+        return this.connections
+      }
+
+      const fuzzyExpression = new RegExp(
+        `${this.filter.split('').reduce((part, c) => `${part}[^${c}]*${c}`)}`,
+        'i',
+      )
+
+      const fuzzyScores = this.connections
+        .map((user) => {
+          const match = user.name.match(fuzzyExpression)
+
+          return {
+            user,
+            score: match ? match[0].length * (match.index + 1) : -1,
+          }
+        })
+        .filter((score) => score.score !== -1)
+        .sort((a, b) => a.score - b.score)
+
+      return fuzzyScores.map((score) => score.user)
+    },
     allConnectionsCount() {
       return this.user[`${this.type}Count`]
     },
@@ -86,13 +125,16 @@ export default {
       })
       this.additionalConnections = data.User[0][this.type]
     },
+    setFilter(evt) {
+      this.$set(this, 'filter', evt.target.value)
+    },
   },
 }
 </script>
 
 <style lang="scss">
 .overflow-container {
-  max-height: 350px;
+  max-height: 300px;
   overflow-y: auto;
 }
 </style>

From 09fb93fc9a3c8f090b44a6927ad23df40bb634bb Mon Sep 17 00:00:00 2001
From: Raphael Beer <raphael.beer@protonmail.com>
Date: Thu, 26 Mar 2020 02:16:39 +0100
Subject: [PATCH 13/54] Fix: message for 0 connections not rendering

---
 webapp/components/features/FollowList.spec.js | 34 +++++++++++++++++++
 .../components/features/FollowList.story.js   | 17 ++++++++--
 webapp/components/features/FollowList.vue     | 14 ++++----
 3 files changed, 57 insertions(+), 8 deletions(-)

diff --git a/webapp/components/features/FollowList.spec.js b/webapp/components/features/FollowList.spec.js
index ea9eeaa2f..f07dffa5f 100644
--- a/webapp/components/features/FollowList.spec.js
+++ b/webapp/components/features/FollowList.spec.js
@@ -75,6 +75,40 @@ describe('FollowList.vue', () => {
         }),
       )
     })
+
+    describe('given a user without connections', () => {
+      ;['following', 'followedBy'].forEach((type) =>
+        describe(`and type=${type}`, () => {
+          let wrapper
+
+          beforeAll(() => {
+            wrapper = mount(FollowList, {
+              store,
+              mocks: {
+                $t: jest.fn().mockReturnValue('has no connections'),
+              },
+              localVue,
+              propsData: {
+                user: {
+                  ...propsData.user,
+                  followedByCount: 0,
+                  followingCount: 0,
+                  followedBy: [],
+                  following: [],
+                },
+                type,
+              },
+            })
+          })
+
+          it('displays ne no-follower message', () => {
+            expect(wrapper.find('.no-connections-message').text()).toBe(
+              `${user.name} ${wrapper.vm.$t(`profile.network.${type}Nobody`)}`,
+            )
+          })
+        }),
+      )
+    })
   })
 })
 
diff --git a/webapp/components/features/FollowList.story.js b/webapp/components/features/FollowList.story.js
index 36a267071..dfd5a3b85 100644
--- a/webapp/components/features/FollowList.story.js
+++ b/webapp/components/features/FollowList.story.js
@@ -84,6 +84,21 @@ const allConnectionsUser = {
 storiesOf('FollowList', module)
   .addDecorator(withA11y)
   .addDecorator(helpers.layout)
+  .add('without connections', () => {
+    const user = {
+      ...sevenConnectionsUser,
+      followedBy: [],
+      followedByCount: 0,
+    }
+    return {
+      components: { FollowList },
+      store: helpers.store,
+      data() {
+        return { user }
+      },
+      template: `<follow-list :user="user" type="followedBy" />`,
+    }
+  })
   .add('with up to 7 connections', () => {
     const user = sevenConnectionsUser
     return {
@@ -94,7 +109,6 @@ storiesOf('FollowList', module)
           user,
         }
       },
-
       template: `<follow-list :user="user" type="followedBy" />`,
     }
   })
@@ -109,7 +123,6 @@ storiesOf('FollowList', module)
           user,
         }
       },
-
       template: `<follow-list :user="user" type="followedBy" />`,
     }
   })
diff --git a/webapp/components/features/FollowList.vue b/webapp/components/features/FollowList.vue
index b03c61a6c..eb9de7f2a 100644
--- a/webapp/components/features/FollowList.vue
+++ b/webapp/components/features/FollowList.vue
@@ -1,10 +1,13 @@
 <template>
-  <base-card style="position: relative; height: 424px;">
+  <base-card style="position: relative; max-height: 424px;">
     <ds-space v-if="this.connections && this.connections.length" margin="x-small">
       <ds-text tag="h5" color="soft">
         {{ userName | truncate(15) }} {{ $t(`profile.network.${type}`) }}
       </ds-text>
     </ds-space>
+    <template v-else>
+      <p class="no-connections-message">{{ userName }} {{ $t(`profile.network.${type}Nobody`) }}</p>
+    </template>
     <ds-space v-if="this.connections && this.connections.length > 7" margin="x-small">
       <ds-input
         ref="filter"
@@ -45,11 +48,6 @@
         </ds-space>
       </div>
     </template>
-    <template v-else>
-      <p style="text-align: center; opacity: 0.5;">
-        {{ userName }} {{ $t(`profile.network.${type}Nobody`) }}
-      </p>
-    </template>
   </base-card>
 </template>
 
@@ -133,6 +131,10 @@ export default {
 </script>
 
 <style lang="scss">
+.no-connections-message {
+  text-align: center;
+  opacity: 0.5;
+}
 .overflow-container {
   max-height: 300px;
   overflow-y: auto;

From ebebb56a365e0d056eba94e1dac69b8a142246fa Mon Sep 17 00:00:00 2001
From: Raphael Beer <raphael.beer@protonmail.com>
Date: Thu, 26 Mar 2020 04:17:46 +0100
Subject: [PATCH 14/54] Chore: apply prettier update to backend change

---
 backend/src/db/seed.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/db/seed.js b/backend/src/db/seed.js
index ca33a50ee..685b5ef0e 100644
--- a/backend/src/db/seed.js
+++ b/backend/src/db/seed.js
@@ -932,7 +932,7 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
       [...Array(30).keys()].map(() => Factory.build('user')),
     )
     await Promise.all(
-      additionalUsers.map(async user => {
+      additionalUsers.map(async (user) => {
         await jennyRostock.relateTo(user, 'following')
         await user.relateTo(jennyRostock, 'following')
       }),

From c7762e353998b33bfdbdaca6400aff0f2d45cf47 Mon Sep 17 00:00:00 2001
From: Raphael Beer <raphael.beer@protonmail.com>
Date: Thu, 26 Mar 2020 05:13:58 +0100
Subject: [PATCH 15/54] Fix: UserAvatar missing alt-attribute

---
 webapp/components/_new/generic/UserAvatar/UserAvatar.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/webapp/components/_new/generic/UserAvatar/UserAvatar.vue b/webapp/components/_new/generic/UserAvatar/UserAvatar.vue
index 7dc63f52f..451d7648b 100644
--- a/webapp/components/_new/generic/UserAvatar/UserAvatar.vue
+++ b/webapp/components/_new/generic/UserAvatar/UserAvatar.vue
@@ -3,9 +3,11 @@
     <span class="initials">{{ userInitials }}</span>
     <base-icon v-if="isAnonymous" name="eye-slash" />
     <img
-      v-else
+      v-if="user && user.avatar"
       :src="user.avatar | proxyApiUrl"
       class="image"
+      :alt="user.name"
+      :title="user.name"
       @error="$event.target.style.display = 'none'"
     />
   </div>

From d07bccfcafdf461fdac0048f345b39e31dedc60a Mon Sep 17 00:00:00 2001
From: Raphael Beer <raphael.beer@protonmail.com>
Date: Thu, 26 Mar 2020 05:16:44 +0100
Subject: [PATCH 16/54] Change: move filter input to bottom

---
 webapp/components/features/FollowList.vue | 44 +++++++++++++----------
 1 file changed, 26 insertions(+), 18 deletions(-)

diff --git a/webapp/components/features/FollowList.vue b/webapp/components/features/FollowList.vue
index eb9de7f2a..0f3bf8cfa 100644
--- a/webapp/components/features/FollowList.vue
+++ b/webapp/components/features/FollowList.vue
@@ -1,5 +1,5 @@
 <template>
-  <base-card style="position: relative; max-height: 424px;">
+  <base-card class="hc-connections">
     <ds-space v-if="this.connections && this.connections.length" margin="x-small">
       <ds-text tag="h5" color="soft">
         {{ userName | truncate(15) }} {{ $t(`profile.network.${type}`) }}
@@ -8,16 +8,6 @@
     <template v-else>
       <p class="no-connections-message">{{ userName }} {{ $t(`profile.network.${type}Nobody`) }}</p>
     </template>
-    <ds-space v-if="this.connections && this.connections.length > 7" margin="x-small">
-      <ds-input
-        ref="filter"
-        @input.native="setFilter"
-        placeholder="filter"
-        v-focus="true"
-        size="small"
-        icon="filter"
-      />
-    </ds-space>
     <template v-if="this.connections && this.connections.length <= 7">
       <ds-space v-for="follow in uniq(this.connections)" :key="follow.id" margin="x-small">
         <!-- TODO: find better solution for rendering errors -->
@@ -47,6 +37,16 @@
           </client-only>
         </ds-space>
       </div>
+      <ds-space margin="x-small">
+        <ds-input
+          ref="filter"
+          @input.native="setFilter"
+          :placeholder="filter"
+          v-focus="true"
+          size="small"
+          icon="filter"
+        />
+      </ds-space>
     </template>
   </base-card>
 </template>
@@ -131,12 +131,20 @@ export default {
 </script>
 
 <style lang="scss">
-.no-connections-message {
-  text-align: center;
-  opacity: 0.5;
-}
-.overflow-container {
-  max-height: 300px;
-  overflow-y: auto;
+.hc-connections {
+  position: relative;
+  max-height: 424px;
+  width: 240px;
+
+  > .no-connections-message {
+    text-align: center;
+    color: $text-color-soft;
+  }
+
+  > .overflow-container {
+    height: $size-avatar-base * 7;
+    margin-top: -8px;
+    overflow-y: auto;
+  }
 }
 </style>

From ee1d33d08483fb137d9d3c92f08e70671d5ee6e7 Mon Sep 17 00:00:00 2001
From: Raphael Beer <raphael.beer@protonmail.com>
Date: Thu, 26 Mar 2020 07:44:55 +0100
Subject: [PATCH 17/54] Add: loading state; for button during fetchConnections

---
 webapp/components/features/FollowList.vue | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/webapp/components/features/FollowList.vue b/webapp/components/features/FollowList.vue
index 0f3bf8cfa..0c6560690 100644
--- a/webapp/components/features/FollowList.vue
+++ b/webapp/components/features/FollowList.vue
@@ -16,7 +16,12 @@
         </client-only>
       </ds-space>
       <ds-space v-if="this.allConnectionsCount - this.connections.length" margin="small">
-        <base-button @click="fetchConnections" size="small" color="softer">
+        <base-button
+          @click="fetchConnections"
+          :loading="this.isLoading"
+          size="small"
+          color="softer"
+        >
           {{
             $t('profile.network.andMore', {
               number: this.allConnectionsCount - this.connections.length,
@@ -69,6 +74,7 @@ export default {
     return {
       additionalConnections: [],
       filter: null,
+      isLoading: false,
       queries: {
         followedBy: followedByQuery,
         following: followingQuery,
@@ -116,12 +122,14 @@ export default {
       return uniqBy(items, field)
     },
     async fetchConnections() {
+      this.$set(this, 'isLoading', true)
       const { data } = await this.$apollo.query({
         query: this.queries[this.type],
         variables: { id: this.user.id },
         // neither result nor update are being called when defined here (?)
       })
       this.additionalConnections = data.User[0][this.type]
+      this.$set(this, 'isLoading', false)
     },
     setFilter(evt) {
       this.$set(this, 'filter', evt.target.value)

From 0db0db690233ecc87293ddf803cbb02144de0206 Mon Sep 17 00:00:00 2001
From: Raphael Beer <raphael.beer@protonmail.com>
Date: Thu, 26 Mar 2020 07:46:08 +0100
Subject: [PATCH 18/54] [dep] Add: apollo-storybook-vue^0.0.6

---
 webapp/package.json |  1 +
 webapp/yarn.lock    | 12 ++++++++++++
 2 files changed, 13 insertions(+)

diff --git a/webapp/package.json b/webapp/package.json
index b0c50fd60..0edc471fd 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -108,6 +108,7 @@
     "@vue/eslint-config-prettier": "~6.0.0",
     "@vue/server-test-utils": "~1.0.0-beta.31",
     "@vue/test-utils": "~1.0.0-beta.31",
+    "apollo-storybook-vue": "^0.0.6",
     "async-validator": "^3.2.4",
     "babel-core": "~7.0.0-bridge.0",
     "babel-eslint": "~10.1.0",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index ad154f9ee..49046a1d0 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -3962,6 +3962,18 @@ apollo-server-types@^0.2.5:
     apollo-server-caching "^0.5.0"
     apollo-server-env "^2.4.3"
 
+apollo-storybook-core@^0.5.4:
+  version "0.5.4"
+  resolved "https://registry.yarnpkg.com/apollo-storybook-core/-/apollo-storybook-core-0.5.4.tgz#8357861cfb127ac9a9d0afc4d87fdf5ff97f39b2"
+  integrity sha512-5h+Yr4Pt2foGJi078gmjlQZ4mj8NBNravjjyhFOrfXTDQd2ODgWn2cwoSGJcpp+iZdkGwwlFkZbyJ1nBTsxukg==
+
+apollo-storybook-vue@^0.0.6:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/apollo-storybook-vue/-/apollo-storybook-vue-0.0.6.tgz#b8db863a18d483ad501065dad62cebda50c581ca"
+  integrity sha512-EUQDyE1uFAOuJRs0aSmyWivd8FsIocu7YshufiFsYgI87vzU3sJ8YZu++k8Y89O7GkVJME0gnOW/tMxXZgKjJA==
+  dependencies:
+    apollo-storybook-core "^0.5.4"
+
 apollo-tracing@^0.8.5:
   version "0.8.5"
   resolved "https://registry.yarnpkg.com/apollo-tracing/-/apollo-tracing-0.8.5.tgz#f07c4584d95bcf750e44bfe9845e073b03774941"

From 1d81d367b07c9f59f173b3db6b4b49b4498a2fd4 Mon Sep 17 00:00:00 2001
From: Raphael Beer <raphael.beer@protonmail.com>
Date: Thu, 26 Mar 2020 07:47:36 +0100
Subject: [PATCH 19/54] Change: use fakered users in storybook

---
 .../components/features/FollowList.story.js   | 110 +++++++-----------
 1 file changed, 45 insertions(+), 65 deletions(-)

diff --git a/webapp/components/features/FollowList.story.js b/webapp/components/features/FollowList.story.js
index dfd5a3b85..dc10a030c 100644
--- a/webapp/components/features/FollowList.story.js
+++ b/webapp/components/features/FollowList.story.js
@@ -1,89 +1,69 @@
+import Vue from 'vue'
+import faker from 'faker'
 import { storiesOf } from '@storybook/vue'
 import { withA11y } from '@storybook/addon-a11y'
+import apolloStorybookDecorator from 'apollo-storybook-vue'
 
 import helpers from '~/storybook/helpers'
 import FollowList from './FollowList.vue'
 
 helpers.init()
 
+const fakeUser = (n) => {
+  return new Array(n || 1).fill(0).map(() => {
+    const name = faker.name.findName()
+    return {
+      id: faker.random.uuid(),
+      name,
+      slug: faker.helpers.slugify(name),
+    }
+  })
+}
+
 const sevenConnectionsUser = {
   name: 'Jenny Rostock',
   id: 'u3',
   followedByCount: 12,
-  followedBy: [
-    {
-      id: '2877b626-bac0-43df-b2bf-4ee025ba38b2',
-      name: 'Kristina Beahan',
-      slug: 'kristina-beahan',
-    },
-    {
-      id: '16b8838d-cc9f-4d30-8601-e4dea77d2f02',
-      name: 'Rhonda Stokes',
-      slug: 'rhonda-stokes',
-    },
-    {
-      id: '47a9846a-87d4-43fa-bf81-51d21dc38ed3',
-      name: 'Benny Lang',
-      slug: 'benny-lang',
-    },
-    {
-      id: 'd3d43b17-e7bb-4778-a373-798df58a9a5f',
-      name: 'Ms. Rita Thompson',
-      slug: 'ms-rita-thompson',
-    },
-    {
-      id: '18a4827c-8b5f-4510-b6fe-09fe8688eed1',
-      name: 'Arthur Johns',
-      slug: 'arthur-johns',
-    },
-    {
-      id: '45313bea-9152-4c8d-9c6e-1eca029979f8',
-      name: 'Jeremiah Breitenberg',
-      slug: 'jeremiah-breitenberg',
-    },
-    {
-      id: 'cfaf1c25-f0ad-4bdf-82a3-e4d8d5e5093e',
-      name: 'Dominic Weimann Jr.',
-      slug: 'dominic-weimann-jr',
-    },
-  ],
+  followedBy: fakeUser(7),
 }
 
 const allConnectionsUser = {
   ...sevenConnectionsUser,
-  followedBy: [
-    ...sevenConnectionsUser.followedBy,
-    {
-      id: '9f305e7a-ae5a-4e22-8269-8b6899af674f',
-      name: 'Hugh Harris Sr.',
-      slug: 'hugh-harris-sr',
-    },
-    {
-      id: '69dbad2b-5749-4697-9976-221992439086',
-      name: 'Ashley Fisher',
-      slug: 'ashley-fisher',
-    },
-    {
-      id: 'eec8ee9e-ee4e-4b83-b655-a106eb857611',
-      name: 'Devin Reynolds',
-      slug: 'devin-reynolds',
-    },
-    {
-      id: 'f638fad4-73c2-4bc9-ae4e-2e53035397e9',
-      name: 'Sophia Jaskolski',
-      slug: 'sophia-jaskolski',
-    },
-    {
-      id: '61040fdf-da6a-489e-b79c-45f58d33386f',
-      name: 'Rodolfo Lind',
-      slug: 'rodolfo-lind',
-    },
-  ],
+  followedBy: [...sevenConnectionsUser.followedBy, ...fakeUser(5)],
 }
 
+const mocks = {
+  Query: () => ({
+    User: () => [allConnectionsUser],
+  }),
+}
+const typeDefs = `
+  type User {
+    followedByCount: Int
+    followedBy(offset: Int): [User] 
+    name: String
+    slug: String
+    id: String
+  }
+  
+  type Query {
+    User(id: ID!): [User]
+  }
+  schema {
+    query: Query
+  }
+`
+
 storiesOf('FollowList', module)
   .addDecorator(withA11y)
   .addDecorator(helpers.layout)
+  .addDecorator(
+    apolloStorybookDecorator({
+      mocks,
+      typeDefs,
+      Vue,
+    }),
+  )
   .add('without connections', () => {
     const user = {
       ...sevenConnectionsUser,

From c9f74c18c0f130bb01ff6407e03ac7dd8e612d5a Mon Sep 17 00:00:00 2001
From: Raphael Beer <raphael.beer@protonmail.com>
Date: Thu, 26 Mar 2020 09:13:16 +0100
Subject: [PATCH 20/54] Fix: card width in mobile view

---
 webapp/components/features/FollowList.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/webapp/components/features/FollowList.vue b/webapp/components/features/FollowList.vue
index 0c6560690..49b728610 100644
--- a/webapp/components/features/FollowList.vue
+++ b/webapp/components/features/FollowList.vue
@@ -44,7 +44,6 @@
       </div>
       <ds-space margin="x-small">
         <ds-input
-          ref="filter"
           @input.native="setFilter"
           :placeholder="filter"
           v-focus="true"
@@ -142,7 +141,7 @@ export default {
 .hc-connections {
   position: relative;
   max-height: 424px;
-  width: 240px;
+  width: auto;
 
   > .no-connections-message {
     text-align: center;

From 41ea370e4b07c8aa9c248a9e45b080c56de1b8c1 Mon Sep 17 00:00:00 2001
From: Raphael Beer <raphael.beer@protonmail.com>
Date: Thu, 26 Mar 2020 09:21:27 +0100
Subject: [PATCH 21/54] Refactor: move all files to folder

---
 webapp/components/features/{ => FollowList}/FollowList.spec.js  | 0
 webapp/components/features/{ => FollowList}/FollowList.story.js | 0
 webapp/components/features/{ => FollowList}/FollowList.vue      | 0
 webapp/pages/profile/_id/_slug.vue                              | 2 +-
 4 files changed, 1 insertion(+), 1 deletion(-)
 rename webapp/components/features/{ => FollowList}/FollowList.spec.js (100%)
 rename webapp/components/features/{ => FollowList}/FollowList.story.js (100%)
 rename webapp/components/features/{ => FollowList}/FollowList.vue (100%)

diff --git a/webapp/components/features/FollowList.spec.js b/webapp/components/features/FollowList/FollowList.spec.js
similarity index 100%
rename from webapp/components/features/FollowList.spec.js
rename to webapp/components/features/FollowList/FollowList.spec.js
diff --git a/webapp/components/features/FollowList.story.js b/webapp/components/features/FollowList/FollowList.story.js
similarity index 100%
rename from webapp/components/features/FollowList.story.js
rename to webapp/components/features/FollowList/FollowList.story.js
diff --git a/webapp/components/features/FollowList.vue b/webapp/components/features/FollowList/FollowList.vue
similarity index 100%
rename from webapp/components/features/FollowList.vue
rename to webapp/components/features/FollowList/FollowList.vue
diff --git a/webapp/pages/profile/_id/_slug.vue b/webapp/pages/profile/_id/_slug.vue
index e9cb6e9fc..2787b4c83 100644
--- a/webapp/pages/profile/_id/_slug.vue
+++ b/webapp/pages/profile/_id/_slug.vue
@@ -219,7 +219,7 @@ import PostTeaser from '~/components/PostTeaser/PostTeaser.vue'
 import HcFollowButton from '~/components/FollowButton.vue'
 import HcCountTo from '~/components/CountTo.vue'
 import HcBadges from '~/components/Badges.vue'
-import FollowList from '~/components/features/FollowList.vue'
+import FollowList from '~/components/features/FollowList/FollowList'
 import HcEmpty from '~/components/Empty/Empty'
 import ContentMenu from '~/components/ContentMenu/ContentMenu'
 import HcUpload from '~/components/Upload'

From 1ac34a8fbadccacbdf92b074eff1caa02d59afeb Mon Sep 17 00:00:00 2001
From: Raphael Beer <raphael.beer@protonmail.com>
Date: Thu, 26 Mar 2020 11:07:43 +0100
Subject: [PATCH 22/54] Refactor: use fakered users in test

---
 .../features/FollowList/FollowList.spec.js    | 176 ++----------------
 .../features/FollowList/FollowList.story.js   |  16 +-
 .../features/FollowList/FollowList.vue        |   4 +-
 webapp/storybook/helpers.js                   |  11 ++
 4 files changed, 34 insertions(+), 173 deletions(-)

diff --git a/webapp/components/features/FollowList/FollowList.spec.js b/webapp/components/features/FollowList/FollowList.spec.js
index f07dffa5f..ebce32a69 100644
--- a/webapp/components/features/FollowList/FollowList.spec.js
+++ b/webapp/components/features/FollowList/FollowList.spec.js
@@ -1,5 +1,7 @@
 import { config, mount } from '@vue/test-utils'
 import Vuex from 'vuex'
+
+import helpers from '~/storybook/helpers'
 import FollowList from './FollowList.vue'
 
 const localVue = global.localVue
@@ -21,7 +23,16 @@ describe('FollowList.vue', () => {
       },
       'auth/isModerator': () => false,
     }
-    propsData = { user }
+    const [_user] = helpers.fakeUser()
+    propsData = {
+      user: {
+        ..._user,
+        followedByCount: 12,
+        followingCount: 15,
+        followedBy: helpers.fakeUser(7),
+        following: helpers.fakeUser(7),
+      },
+    }
   })
 
   describe('mount', () => {
@@ -56,7 +67,7 @@ describe('FollowList.vue', () => {
           })
 
           it(`shows the users ${type}`, () => {
-            expect(wrapper.findAll('.user-teaser').length).toEqual(user[type].length)
+            expect(wrapper.findAll('.user-teaser').length).toEqual(propsData.user[type].length)
           })
 
           it(`has a button to load all remaining users ${type}`, async () => {
@@ -66,10 +77,10 @@ describe('FollowList.vue', () => {
             await jest.runAllTicks()
             await wrapper.vm.$nextTick()
 
-            expect(wrapper.vm.connections.length).toBe(user[`${type}Count`])
+            expect(wrapper.vm.connections.length).toBe(propsData.user[`${type}Count`])
             expect(queryMock).toHaveBeenCalledWith({
               query: wrapper.vm.queries[type],
-              variables: { id: user.id },
+              variables: { id: propsData.user.id },
             })
           })
         }),
@@ -102,8 +113,8 @@ describe('FollowList.vue', () => {
           })
 
           it('displays ne no-follower message', () => {
-            expect(wrapper.find('.no-connections-message').text()).toBe(
-              `${user.name} ${wrapper.vm.$t(`profile.network.${type}Nobody`)}`,
+            expect(wrapper.find('.no-connections').text()).toBe(
+              `${propsData.user.name} ${wrapper.vm.$t()}`,
             )
           })
         }),
@@ -112,156 +123,7 @@ describe('FollowList.vue', () => {
   })
 })
 
-const user = {
-  name: 'Jenny Rostock',
-  id: 'u3',
-  followedByCount: 12,
-  followingCount: 15,
-  followedBy: [
-    {
-      id: '2877b626-bac0-43df-b2bf-4ee025ba38b2',
-      name: 'Kristina Beahan',
-      slug: 'kristina-beahan',
-    },
-    {
-      id: '16b8838d-cc9f-4d30-8601-e4dea77d2f02',
-      name: 'Rhonda Stokes',
-      slug: 'rhonda-stokes',
-    },
-    {
-      id: '47a9846a-87d4-43fa-bf81-51d21dc38ed3',
-      name: 'Benny Lang',
-      slug: 'benny-lang',
-    },
-    {
-      id: 'd3d43b17-e7bb-4778-a373-798df58a9a5f',
-      name: 'Ms. Rita Thompson',
-      slug: 'ms-rita-thompson',
-    },
-    {
-      id: '18a4827c-8b5f-4510-b6fe-09fe8688eed1',
-      name: 'Arthur Johns',
-      slug: 'arthur-johns',
-    },
-    {
-      id: '45313bea-9152-4c8d-9c6e-1eca029979f8',
-      name: 'Jeremiah Breitenberg',
-      slug: 'jeremiah-breitenberg',
-    },
-    {
-      id: 'cfaf1c25-f0ad-4bdf-82a3-e4d8d5e5093e',
-      name: 'Dominic Weimann Jr.',
-      slug: 'dominic-weimann-jr',
-    },
-  ],
-  following: [
-    {
-      id: '16b8838d-cc9f-4d30-8601-e4dea77d2f02',
-      name: 'Rhonda Stokes',
-      slug: 'rhonda-stokes',
-    },
-    {
-      id: '47a9846a-87d4-43fa-bf81-51d21dc38ed3',
-      name: 'Benny Lang',
-      slug: 'benny-lang',
-    },
-    {
-      id: '18a4827c-8b5f-4510-b6fe-09fe8688eed1',
-      name: 'Arthur Johns',
-      slug: 'arthur-johns',
-    },
-    {
-      id: 'cfaf1c25-f0ad-4bdf-82a3-e4d8d5e5093e',
-      name: 'Dominic Weimann Jr.',
-      slug: 'dominic-weimann-jr',
-    },
-    {
-      id: '69dbad2b-5749-4697-9976-221992439086',
-      name: 'Ashley Fisher',
-      slug: 'ashley-fisher',
-    },
-    {
-      id: 'a09a2341-0575-4235-96c6-2ebc7d77de3f',
-      name: 'Phil Dare',
-      slug: 'phil-dare',
-    },
-    {
-      id: '2877b626-bac0-43df-b2bf-4ee025ba38b2',
-      name: 'Kristina Beahan',
-      slug: 'kristina-beahan',
-    },
-  ],
-}
-
 const additionalConnections = {
-  followedBy: [
-    {
-      id: '9f305e7a-ae5a-4e22-8269-8b6899af674f',
-      name: 'Hugh Harris Sr.',
-      slug: 'hugh-harris-sr',
-    },
-    {
-      id: '69dbad2b-5749-4697-9976-221992439086',
-      name: 'Ashley Fisher',
-      slug: 'ashley-fisher',
-    },
-    {
-      id: 'eec8ee9e-ee4e-4b83-b655-a106eb857611',
-      name: 'Devin Reynolds',
-      slug: 'devin-reynolds',
-    },
-    {
-      id: 'f638fad4-73c2-4bc9-ae4e-2e53035397e9',
-      name: 'Sophia Jaskolski',
-      slug: 'sophia-jaskolski',
-    },
-    {
-      id: '61040fdf-da6a-489e-b79c-45f58d33386f',
-      name: 'Rodolfo Lind',
-      slug: 'rodolfo-lind',
-    },
-  ],
-
-  following: [
-    {
-      id: '9011b4fd-feec-4b74-b6d0-e0a41b6658e6',
-      name: 'Lela Kautzer',
-      slug: 'lela-kautzer',
-    },
-    {
-      id: '61040fdf-da6a-489e-b79c-45f58d33386f',
-      name: 'Rodolfo Lind',
-      slug: 'rodolfo-lind',
-    },
-    {
-      id: '3a089655-19c8-478f-97c1-345b3dfc95a3',
-      name: 'Lee Erdman',
-      slug: 'lee-erdman',
-    },
-    {
-      id: 'c5f7eea9-ee4b-4384-91cd-b6c7d128f122',
-      name: 'Omar Turcotte',
-      slug: 'omar-turcotte',
-    },
-    {
-      id: 'f638fad4-73c2-4bc9-ae4e-2e53035397e9',
-      name: 'Sophia Jaskolski',
-      slug: 'sophia-jaskolski',
-    },
-    {
-      id: 'u4',
-      name: 'Huey',
-      slug: 'huey',
-    },
-    {
-      id: '6de37964-e79b-4be4-b384-ed571c37a31e',
-      name: 'Mr. Oliver Quitzon',
-      slug: 'mr-oliver-quitzon',
-    },
-    {
-      id: 'd3d43b17-e7bb-4778-a373-798df58a9a5f',
-      name: 'Ms. Rita Thompson',
-      slug: 'ms-rita-thompson',
-    },
-  ],
+  followedBy: helpers.fakeUser(5),
+  following: helpers.fakeUser(8),
 }
diff --git a/webapp/components/features/FollowList/FollowList.story.js b/webapp/components/features/FollowList/FollowList.story.js
index dc10a030c..7c6918c94 100644
--- a/webapp/components/features/FollowList/FollowList.story.js
+++ b/webapp/components/features/FollowList/FollowList.story.js
@@ -1,5 +1,4 @@
 import Vue from 'vue'
-import faker from 'faker'
 import { storiesOf } from '@storybook/vue'
 import { withA11y } from '@storybook/addon-a11y'
 import apolloStorybookDecorator from 'apollo-storybook-vue'
@@ -9,27 +8,16 @@ import FollowList from './FollowList.vue'
 
 helpers.init()
 
-const fakeUser = (n) => {
-  return new Array(n || 1).fill(0).map(() => {
-    const name = faker.name.findName()
-    return {
-      id: faker.random.uuid(),
-      name,
-      slug: faker.helpers.slugify(name),
-    }
-  })
-}
-
 const sevenConnectionsUser = {
   name: 'Jenny Rostock',
   id: 'u3',
   followedByCount: 12,
-  followedBy: fakeUser(7),
+  followedBy: helpers.fakeUser(7),
 }
 
 const allConnectionsUser = {
   ...sevenConnectionsUser,
-  followedBy: [...sevenConnectionsUser.followedBy, ...fakeUser(5)],
+  followedBy: [...sevenConnectionsUser.followedBy, ...helpers.fakeUser(5)],
 }
 
 const mocks = {
diff --git a/webapp/components/features/FollowList/FollowList.vue b/webapp/components/features/FollowList/FollowList.vue
index 49b728610..7ec23af34 100644
--- a/webapp/components/features/FollowList/FollowList.vue
+++ b/webapp/components/features/FollowList/FollowList.vue
@@ -6,7 +6,7 @@
       </ds-text>
     </ds-space>
     <template v-else>
-      <p class="no-connections-message">{{ userName }} {{ $t(`profile.network.${type}Nobody`) }}</p>
+      <p class="no-connections">{{ userName }} {{ $t(`profile.network.${type}Nobody`) }}</p>
     </template>
     <template v-if="this.connections && this.connections.length <= 7">
       <ds-space v-for="follow in uniq(this.connections)" :key="follow.id" margin="x-small">
@@ -143,7 +143,7 @@ export default {
   max-height: 424px;
   width: auto;
 
-  > .no-connections-message {
+  > .no-connections {
     text-align: center;
     color: $text-color-soft;
   }
diff --git a/webapp/storybook/helpers.js b/webapp/storybook/helpers.js
index b6abf4c99..ea57600b8 100644
--- a/webapp/storybook/helpers.js
+++ b/webapp/storybook/helpers.js
@@ -1,5 +1,6 @@
 import Vue from 'vue'
 import Vuex from 'vuex'
+import faker from 'faker'
 import vuexI18n from 'vuex-i18n/dist/vuex-i18n.umd.js'
 import Styleguide from '@human-connection/styleguide'
 import Filters from '~/plugins/vue-filters'
@@ -59,6 +60,16 @@ const helpers = {
       </layout>`,
     }
   },
+  fakeUser(n) {
+    return new Array(n || 1).fill(0).map(() => {
+      const name = faker.name.findName()
+      return {
+        id: faker.random.uuid(),
+        name,
+        slug: faker.helpers.slugify(name),
+      }
+    })
+  },
 }
 
 export default helpers

From e516ae93a75891320b3f4ec50d2cb08c5bf41070 Mon Sep 17 00:00:00 2001
From: Raphael Beer <raphael.beer@protonmail.com>
Date: Fri, 27 Mar 2020 09:03:25 +0100
Subject: [PATCH 23/54] Fix: naming conventions

Co-Authored-By: mattwr18 <mattwr18@gmail.com>
---
 webapp/components/features/FollowList/FollowList.spec.js | 4 ++--
 webapp/components/features/FollowList/FollowList.vue     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/webapp/components/features/FollowList/FollowList.spec.js b/webapp/components/features/FollowList/FollowList.spec.js
index ebce32a69..38efd5bd8 100644
--- a/webapp/components/features/FollowList/FollowList.spec.js
+++ b/webapp/components/features/FollowList/FollowList.spec.js
@@ -73,7 +73,7 @@ describe('FollowList.vue', () => {
           it(`has a button to load all remaining users ${type}`, async () => {
             jest.useFakeTimers()
 
-            wrapper.find('button').trigger('click')
+            wrapper.find('.base-button').trigger('click')
             await jest.runAllTicks()
             await wrapper.vm.$nextTick()
 
@@ -112,7 +112,7 @@ describe('FollowList.vue', () => {
             })
           })
 
-          it('displays ne no-follower message', () => {
+          it('displays the no-follower message', () => {
             expect(wrapper.find('.no-connections').text()).toBe(
               `${propsData.user.name} ${wrapper.vm.$t()}`,
             )
diff --git a/webapp/components/features/FollowList/FollowList.vue b/webapp/components/features/FollowList/FollowList.vue
index 7ec23af34..5f3eb52a7 100644
--- a/webapp/components/features/FollowList/FollowList.vue
+++ b/webapp/components/features/FollowList/FollowList.vue
@@ -1,6 +1,6 @@
 <template>
-  <base-card class="hc-connections">
-    <ds-space v-if="this.connections && this.connections.length" margin="x-small">
+  <base-card class="follow-list">
+    <ds-space v-if="connections && connections.length" margin="x-small">
       <ds-text tag="h5" color="soft">
         {{ userName | truncate(15) }} {{ $t(`profile.network.${type}`) }}
       </ds-text>

From f69e7e42de901e3743be37f77d3ca4056f39418d Mon Sep 17 00:00:00 2001
From: Raphael Beer <raphael.beer@protonmail.com>
Date: Fri, 27 Mar 2020 09:37:40 +0100
Subject: [PATCH 24/54] Fix: finish naming conventions

---
 .../features/FollowList/FollowList.vue        | 21 +++++++------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/webapp/components/features/FollowList/FollowList.vue b/webapp/components/features/FollowList/FollowList.vue
index 5f3eb52a7..29086eb66 100644
--- a/webapp/components/features/FollowList/FollowList.vue
+++ b/webapp/components/features/FollowList/FollowList.vue
@@ -8,32 +8,27 @@
     <template v-else>
       <p class="no-connections">{{ userName }} {{ $t(`profile.network.${type}Nobody`) }}</p>
     </template>
-    <template v-if="this.connections && this.connections.length <= 7">
-      <ds-space v-for="follow in uniq(this.connections)" :key="follow.id" margin="x-small">
+    <template v-if="connections && connections.length <= 7">
+      <ds-space v-for="follow in uniq(connections)" :key="follow.id" margin="x-small">
         <!-- TODO: find better solution for rendering errors -->
         <client-only>
           <user-teaser :user="follow" />
         </client-only>
       </ds-space>
-      <ds-space v-if="this.allConnectionsCount - this.connections.length" margin="small">
-        <base-button
-          @click="fetchConnections"
-          :loading="this.isLoading"
-          size="small"
-          color="softer"
-        >
+      <ds-space v-if="allConnectionsCount - connections.length" margin="small">
+        <base-button @click="fetchConnections" :loading="isLoading" size="small" color="softer">
           {{
             $t('profile.network.andMore', {
-              number: this.allConnectionsCount - this.connections.length,
+              number: allConnectionsCount - connections.length,
             })
           }}
         </base-button>
       </ds-space>
     </template>
-    <template v-else-if="this.connections.length > 7">
+    <template v-else-if="connections.length > 7">
       <div class="overflow-container">
         <ds-space
-          v-for="follow in uniq(this.filteredConnections)"
+          v-for="follow in uniq(filteredConnections)"
           :key="follow.id"
           margin="x-small"
         >
@@ -138,7 +133,7 @@ export default {
 </script>
 
 <style lang="scss">
-.hc-connections {
+.follow-list {
   position: relative;
   max-height: 424px;
   width: auto;

From e6361c9b740f104c0a0d86b463be835f10311f3d Mon Sep 17 00:00:00 2001
From: Raphael Beer <raphael.beer@protonmail.com>
Date: Sat, 28 Mar 2020 03:26:35 +0100
Subject: [PATCH 25/54] Refactor: move following/followedBy updating to page
 component

---
 .../features/FollowList/FollowList.spec.js    | 180 +++++++++---------
 .../features/FollowList/FollowList.story.js   |  40 +---
 .../features/FollowList/FollowList.vue        |  52 ++---
 webapp/graphql/User.js                        |  30 +--
 webapp/pages/profile/_id/_slug.vue            |  32 +++-
 5 files changed, 142 insertions(+), 192 deletions(-)

diff --git a/webapp/components/features/FollowList/FollowList.spec.js b/webapp/components/features/FollowList/FollowList.spec.js
index 38efd5bd8..6bda73acc 100644
--- a/webapp/components/features/FollowList/FollowList.spec.js
+++ b/webapp/components/features/FollowList/FollowList.spec.js
@@ -10,29 +10,50 @@ config.stubs['client-only'] = '<span><slot /></span>'
 config.stubs['ds-space'] = '<span><slot /></span>'
 config.stubs['nuxt-link'] = '<span><slot /></span>'
 
+const user = {
+  ...helpers.fakeUser()[0],
+  followedByCount: 12,
+  followingCount: 15,
+  followedBy: helpers.fakeUser(7),
+  following: helpers.fakeUser(7),
+}
+
+const allConnectionsUser = {
+  ...user,
+  followedBy: [
+    ...user.followedBy,
+    ...helpers.fakeUser(user.followedByCount - user.followedBy.length),
+  ],
+  following: [...user.following, ...helpers.fakeUser(user.followingCount - user.following.length)],
+}
+
+const noConnectionsUser = {
+  ...user,
+  followedByCount: 0,
+  followingCount: 0,
+  followedBy: [],
+  following: [],
+}
+
 describe('FollowList.vue', () => {
-  let store, mocks, getters, propsData
+  let store, getters
+  const Wrapper = (customProps) =>
+    mount(FollowList, {
+      store,
+      propsData: { user, ...customProps },
+      mocks: {
+        $t: jest.fn((str) => str),
+      },
+      localVue,
+    })
 
   beforeAll(() => {
-    mocks = {
-      $t: jest.fn(),
-    }
     getters = {
       'auth/user': () => {
         return {}
       },
       'auth/isModerator': () => false,
     }
-    const [_user] = helpers.fakeUser()
-    propsData = {
-      user: {
-        ..._user,
-        followedByCount: 12,
-        followingCount: 15,
-        followedBy: helpers.fakeUser(7),
-        following: helpers.fakeUser(7),
-      },
-    }
   })
 
   describe('mount', () => {
@@ -42,88 +63,71 @@ describe('FollowList.vue', () => {
       })
     })
 
-    describe('given a user with connections', () => {
-      ;['following', 'followedBy'].forEach((type) =>
-        describe(`and type=${type}`, () => {
-          let wrapper
-          let queryMock
+    describe('given a user', () => {
+      describe('without connections', () => {
+        it('displays the followingNobody message', () => {
+          const wrapper = Wrapper({ user: noConnectionsUser })
+          expect(wrapper.find('.no-connections').text()).toBe(
+            `${noConnectionsUser.name} ${wrapper.vm.$t(`profile.network.followingNobody`)}`,
+          )
+        })
 
-          beforeAll(() => {
-            queryMock = jest.fn().mockResolvedValue({
-              data: { User: [{ [type]: additionalConnections[type] }] },
-            })
+        it('displays the followedByNobody message', () => {
+          const wrapper = Wrapper({ user: noConnectionsUser, type: 'followedBy' })
+          expect(wrapper.find('.no-connections').text()).toBe(
+            `${noConnectionsUser.name} ${wrapper.vm.$t(`profile.network.followedByNobody`)}`,
+          )
+        })
+      })
 
-            wrapper = mount(FollowList, {
-              store,
-              propsData: { ...propsData, type: type },
-              mocks: {
-                ...mocks,
-                $apollo: {
-                  query: queryMock,
-                },
-              },
-              localVue,
-            })
-          })
+      describe('with up to 7 loaded connections', () => {
+        let followingWrapper
+        let followedByWrapper
+        beforeAll(() => {
+          followingWrapper = Wrapper()
+          followedByWrapper = Wrapper({ type: 'followedBy' })
+        })
 
-          it(`shows the users ${type}`, () => {
-            expect(wrapper.findAll('.user-teaser').length).toEqual(propsData.user[type].length)
-          })
+        it(`renders the connections`, () => {
+          expect(followedByWrapper.findAll('.user-teaser').length).toEqual(user.followedBy.length)
+          expect(followingWrapper.findAll('.user-teaser').length).toEqual(user.following.length)
+        })
 
-          it(`has a button to load all remaining users ${type}`, async () => {
-            jest.useFakeTimers()
+        it(`has a button to load all remaining connections`, async () => {
+          followingWrapper.find('.base-button').trigger('click')
+          followedByWrapper.find('.base-button').trigger('click')
+          expect(followingWrapper.emitted('fetchAllConnections')).toBeTruthy()
+          expect(followedByWrapper.emitted('fetchAllConnections')).toBeTruthy()
+        })
+      })
 
-            wrapper.find('.base-button').trigger('click')
-            await jest.runAllTicks()
-            await wrapper.vm.$nextTick()
+      describe('with more than 7 loaded connections', () => {
+        let followingWrapper
+        let followedByWrapper
+        beforeAll(() => {
+          followingWrapper = Wrapper({ user: allConnectionsUser })
+          followedByWrapper = Wrapper({ user: allConnectionsUser, type: 'followedBy' })
+        })
 
-            expect(wrapper.vm.connections.length).toBe(propsData.user[`${type}Count`])
-            expect(queryMock).toHaveBeenCalledWith({
-              query: wrapper.vm.queries[type],
-              variables: { id: propsData.user.id },
-            })
-          })
-        }),
-      )
-    })
+        it('renders the connections', () => {
+          expect(followedByWrapper.findAll('.user-teaser')).toHaveLength(
+            allConnectionsUser.followedByCount,
+          )
+          expect(followingWrapper.findAll('.user-teaser')).toHaveLength(
+            allConnectionsUser.followingCount,
+          )
+        })
 
-    describe('given a user without connections', () => {
-      ;['following', 'followedBy'].forEach((type) =>
-        describe(`and type=${type}`, () => {
-          let wrapper
+        it('renders the user-teaser in an overflow-container', () => {
+          expect(followingWrapper.find('.overflow-container').is('div')).toBe(true)
+          expect(followedByWrapper.find('.overflow-container').is('div')).toBe(true)
+        })
 
-          beforeAll(() => {
-            wrapper = mount(FollowList, {
-              store,
-              mocks: {
-                $t: jest.fn().mockReturnValue('has no connections'),
-              },
-              localVue,
-              propsData: {
-                user: {
-                  ...propsData.user,
-                  followedByCount: 0,
-                  followingCount: 0,
-                  followedBy: [],
-                  following: [],
-                },
-                type,
-              },
-            })
-          })
-
-          it('displays the no-follower message', () => {
-            expect(wrapper.find('.no-connections').text()).toBe(
-              `${propsData.user.name} ${wrapper.vm.$t()}`,
-            )
-          })
-        }),
-      )
+        it('renders a filter text input', () => {
+          expect(followingWrapper.find('[name="followingFilter"]').is('input')).toBe(true)
+          expect(followedByWrapper.find('[name="followedByFilter"]').is('input')).toBe(true)
+        })
+      })
     })
   })
 })
-
-const additionalConnections = {
-  followedBy: helpers.fakeUser(5),
-  following: helpers.fakeUser(8),
-}
diff --git a/webapp/components/features/FollowList/FollowList.story.js b/webapp/components/features/FollowList/FollowList.story.js
index 7c6918c94..b8cc02978 100644
--- a/webapp/components/features/FollowList/FollowList.story.js
+++ b/webapp/components/features/FollowList/FollowList.story.js
@@ -1,7 +1,6 @@
-import Vue from 'vue'
 import { storiesOf } from '@storybook/vue'
 import { withA11y } from '@storybook/addon-a11y'
-import apolloStorybookDecorator from 'apollo-storybook-vue'
+import { action } from '@storybook/addon-actions'
 
 import helpers from '~/storybook/helpers'
 import FollowList from './FollowList.vue'
@@ -20,38 +19,9 @@ const allConnectionsUser = {
   followedBy: [...sevenConnectionsUser.followedBy, ...helpers.fakeUser(5)],
 }
 
-const mocks = {
-  Query: () => ({
-    User: () => [allConnectionsUser],
-  }),
-}
-const typeDefs = `
-  type User {
-    followedByCount: Int
-    followedBy(offset: Int): [User] 
-    name: String
-    slug: String
-    id: String
-  }
-  
-  type Query {
-    User(id: ID!): [User]
-  }
-  schema {
-    query: Query
-  }
-`
-
 storiesOf('FollowList', module)
   .addDecorator(withA11y)
   .addDecorator(helpers.layout)
-  .addDecorator(
-    apolloStorybookDecorator({
-      mocks,
-      typeDefs,
-      Vue,
-    }),
-  )
   .add('without connections', () => {
     const user = {
       ...sevenConnectionsUser,
@@ -77,7 +47,13 @@ storiesOf('FollowList', module)
           user,
         }
       },
-      template: `<follow-list :user="user" type="followedBy" />`,
+      methods: {
+        fetchAllConnections(type) {
+          this.user = allConnectionsUser
+          action('fetchAllConnections')(type, this.user)
+        },
+      },
+      template: `<follow-list :user="user" type="followedBy" @fetchAllConnections="fetchAllConnections"/>`,
     }
   })
 
diff --git a/webapp/components/features/FollowList/FollowList.vue b/webapp/components/features/FollowList/FollowList.vue
index 29086eb66..06ce5201f 100644
--- a/webapp/components/features/FollowList/FollowList.vue
+++ b/webapp/components/features/FollowList/FollowList.vue
@@ -9,14 +9,19 @@
       <p class="no-connections">{{ userName }} {{ $t(`profile.network.${type}Nobody`) }}</p>
     </template>
     <template v-if="connections && connections.length <= 7">
-      <ds-space v-for="follow in uniq(connections)" :key="follow.id" margin="x-small">
+      <ds-space v-for="connection in connections" :key="connection.id" margin="x-small">
         <!-- TODO: find better solution for rendering errors -->
         <client-only>
-          <user-teaser :user="follow" />
+          <user-teaser :user="connection" />
         </client-only>
       </ds-space>
       <ds-space v-if="allConnectionsCount - connections.length" margin="small">
-        <base-button @click="fetchConnections" :loading="isLoading" size="small" color="softer">
+        <base-button
+          @click="$emit('fetchAllConnections', type)"
+          :loading="loading"
+          size="small"
+          color="softer"
+        >
           {{
             $t('profile.network.andMore', {
               number: allConnectionsCount - connections.length,
@@ -27,13 +32,9 @@
     </template>
     <template v-else-if="connections.length > 7">
       <div class="overflow-container">
-        <ds-space
-          v-for="follow in uniq(filteredConnections)"
-          :key="follow.id"
-          margin="x-small"
-        >
+        <ds-space v-for="connection in filteredConnections" :key="connection.id" margin="x-small">
           <client-only>
-            <user-teaser :user="follow" />
+            <user-teaser :user="connection" />
           </client-only>
         </ds-space>
       </div>
@@ -44,6 +45,7 @@
           v-focus="true"
           size="small"
           icon="filter"
+          :name="`${type}Filter`"
         />
       </ds-space>
     </template>
@@ -51,9 +53,7 @@
 </template>
 
 <script>
-import uniqBy from 'lodash/uniqBy'
 import UserTeaser from '~/components/UserTeaser/UserTeaser'
-import { followedByQuery, followingQuery } from '~/graphql/User'
 
 export default {
   name: 'FollowerList',
@@ -63,16 +63,11 @@ export default {
   props: {
     user: { type: Object, default: null },
     type: { type: String, default: 'following' },
+    loading: { type: Boolean, default: false },
   },
   data() {
     return {
-      additionalConnections: [],
       filter: null,
-      isLoading: false,
-      queries: {
-        followedBy: followedByQuery,
-        following: followingQuery,
-      },
     }
   },
   computed: {
@@ -80,8 +75,11 @@ export default {
       const { name } = this.user || {}
       return name || this.$t('profile.userAnonym')
     },
+    allConnectionsCount() {
+      return this.user[`${this.type}Count`]
+    },
     connections() {
-      return [...this.user[this.type], ...this.additionalConnections]
+      return this.user[this.type]
     },
     filteredConnections() {
       if (!this.filter) {
@@ -107,26 +105,10 @@ export default {
 
       return fuzzyScores.map((score) => score.user)
     },
-    allConnectionsCount() {
-      return this.user[`${this.type}Count`]
-    },
   },
   methods: {
-    uniq(items, field = 'id') {
-      return uniqBy(items, field)
-    },
-    async fetchConnections() {
-      this.$set(this, 'isLoading', true)
-      const { data } = await this.$apollo.query({
-        query: this.queries[this.type],
-        variables: { id: this.user.id },
-        // neither result nor update are being called when defined here (?)
-      })
-      this.additionalConnections = data.User[0][this.type]
-      this.$set(this, 'isLoading', false)
-    },
     setFilter(evt) {
-      this.$set(this, 'filter', evt.target.value)
+      this.filter = evt.target.value
     },
   },
 }
diff --git a/webapp/graphql/User.js b/webapp/graphql/User.js
index 1e9e40ce6..daf586284 100644
--- a/webapp/graphql/User.js
+++ b/webapp/graphql/User.js
@@ -14,7 +14,7 @@ export default (i18n) => {
     ${userCountsFragment}
     ${locationAndBadgesFragment(lang)}
 
-    query User($id: ID!) {
+    query User($id: ID!, $followedByCount: Int, $followingCount: Int) {
       User(id: $id) {
         ...user
         ...userCounts
@@ -26,12 +26,12 @@ export default (i18n) => {
         isMuted
         isBlocked
         blocked
-        following(first: 7) {
+        following(first: $followingCount) {
           ...user
           ...userCounts
           ...locationAndBadges
         }
-        followedBy(first: 7) {
+        followedBy(first: $followedByCount) {
           ...user
           ...userCounts
           ...locationAndBadges
@@ -283,27 +283,3 @@ export const currentUserQuery = gql`
     }
   }
 `
-
-export const followedByQuery = gql`
-  query($id: ID!) {
-    User(id: $id) {
-      followedBy(offset: 7) {
-        id
-        slug
-        name
-      }
-    }
-  }
-`
-
-export const followingQuery = gql`
-  query($id: ID!) {
-    User(id: $id) {
-      following(offset: 7) {
-        id
-        slug
-        name
-      }
-    }
-  }
-`
diff --git a/webapp/pages/profile/_id/_slug.vue b/webapp/pages/profile/_id/_slug.vue
index 2787b4c83..b3f056a3d 100644
--- a/webapp/pages/profile/_id/_slug.vue
+++ b/webapp/pages/profile/_id/_slug.vue
@@ -89,9 +89,19 @@
         <ds-heading tag="h3" soft style="text-align: center; margin-bottom: 10px;">
           {{ $t('profile.network.title') }}
         </ds-heading>
-        <follow-list :user="user" type="followedBy" />
+        <follow-list
+          :user="user"
+          type="followedBy"
+          @fetchAllConnections="fetchAllConnections"
+          :loading="$apollo.loading"
+        />
         <ds-space />
-        <follow-list :user="user" type="following" />
+        <follow-list
+          :user="user"
+          type="following"
+          @fetchAllConnections="fetchAllConnections"
+          :loading="$apollo.loading"
+        />
         <ds-space v-if="user.socialMedia && user.socialMedia.length" margin="large">
           <base-card style="position: relative; height: auto;">
             <ds-space margin="x-small">
@@ -270,6 +280,8 @@ export default {
       tabActive: 'post',
       filter,
       followedByCountStartValue: 0,
+      followedByCount: 7,
+      followingCount: 7,
     }
   },
   computed: {
@@ -299,13 +311,6 @@ export default {
       return slug && `@${slug}`
     },
   },
-  watch: {
-    User(val) {
-      if (!val || !val.length) {
-        throw new Error('User not found!')
-      }
-    },
-  },
   methods: {
     removePostFromList(deletedPost) {
       this.posts = this.posts.filter((post) => {
@@ -427,6 +432,9 @@ export default {
       this.user.followedByCurrentUser = followedByCurrentUser
       this.user.followedBy = followedBy
     },
+    fetchAllConnections(type) {
+      this[`${type}Count`] = Infinity
+    },
   },
   apollo: {
     profilePagePosts: {
@@ -451,7 +459,11 @@ export default {
         return UserQuery(this.$i18n)
       },
       variables() {
-        return { id: this.$route.params.id }
+        return {
+          id: this.$route.params.id,
+          followedByCount: this.followedByCount || 7,
+          followingCount: this.followingCount || 7,
+        }
       },
       fetchPolicy: 'cache-and-network',
     },

From 95bc6d9719c306f655e271071e6f6cbb08307a9f Mon Sep 17 00:00:00 2001
From: Raphael Beer <raphael.beer@protonmail.com>
Date: Sat, 28 Mar 2020 03:43:04 +0100
Subject: [PATCH 26/54] Revert "[dep] Add: apollo-storybook-vue^0.0.6"

This reverts commit 0db0db690233ecc87293ddf803cbb02144de0206.
---
 webapp/package.json |  1 -
 webapp/yarn.lock    | 12 ------------
 2 files changed, 13 deletions(-)

diff --git a/webapp/package.json b/webapp/package.json
index 0edc471fd..b0c50fd60 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -108,7 +108,6 @@
     "@vue/eslint-config-prettier": "~6.0.0",
     "@vue/server-test-utils": "~1.0.0-beta.31",
     "@vue/test-utils": "~1.0.0-beta.31",
-    "apollo-storybook-vue": "^0.0.6",
     "async-validator": "^3.2.4",
     "babel-core": "~7.0.0-bridge.0",
     "babel-eslint": "~10.1.0",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index 49046a1d0..ad154f9ee 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -3962,18 +3962,6 @@ apollo-server-types@^0.2.5:
     apollo-server-caching "^0.5.0"
     apollo-server-env "^2.4.3"
 
-apollo-storybook-core@^0.5.4:
-  version "0.5.4"
-  resolved "https://registry.yarnpkg.com/apollo-storybook-core/-/apollo-storybook-core-0.5.4.tgz#8357861cfb127ac9a9d0afc4d87fdf5ff97f39b2"
-  integrity sha512-5h+Yr4Pt2foGJi078gmjlQZ4mj8NBNravjjyhFOrfXTDQd2ODgWn2cwoSGJcpp+iZdkGwwlFkZbyJ1nBTsxukg==
-
-apollo-storybook-vue@^0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/apollo-storybook-vue/-/apollo-storybook-vue-0.0.6.tgz#b8db863a18d483ad501065dad62cebda50c581ca"
-  integrity sha512-EUQDyE1uFAOuJRs0aSmyWivd8FsIocu7YshufiFsYgI87vzU3sJ8YZu++k8Y89O7GkVJME0gnOW/tMxXZgKjJA==
-  dependencies:
-    apollo-storybook-core "^0.5.4"
-
 apollo-tracing@^0.8.5:
   version "0.8.5"
   resolved "https://registry.yarnpkg.com/apollo-tracing/-/apollo-tracing-0.8.5.tgz#f07c4584d95bcf750e44bfe9845e073b03774941"

From d62be2b0fbe8d8ef887862d7ee7fc15201d2d8c9 Mon Sep 17 00:00:00 2001
From: Raphael Beer <raphael.beer@protonmail.com>
Date: Sat, 28 Mar 2020 12:54:35 +0100
Subject: [PATCH 27/54] Clean: make use of design tokens

---
 .../features/FollowList/FollowList.story.js   | 44 +++++++++----------
 .../features/FollowList/FollowList.vue        |  6 +--
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/webapp/components/features/FollowList/FollowList.story.js b/webapp/components/features/FollowList/FollowList.story.js
index b8cc02978..0d117df95 100644
--- a/webapp/components/features/FollowList/FollowList.story.js
+++ b/webapp/components/features/FollowList/FollowList.story.js
@@ -7,66 +7,66 @@ import FollowList from './FollowList.vue'
 
 helpers.init()
 
-const sevenConnectionsUser = {
+const user = {
   name: 'Jenny Rostock',
   id: 'u3',
   followedByCount: 12,
   followedBy: helpers.fakeUser(7),
+  followingCount: 28,
+  following: helpers.fakeUser(7),
 }
 
 const allConnectionsUser = {
-  ...sevenConnectionsUser,
-  followedBy: [...sevenConnectionsUser.followedBy, ...helpers.fakeUser(5)],
+  ...user,
+  followedBy: [...user.followedBy, ...helpers.fakeUser(5)],
+  following: [...user.following, ...helpers.fakeUser(21)],
+}
+
+const noConnectionsUser = {
+  ...user,
+  followedBy: [],
+  followedByCount: 0,
+  following: [],
+  followingCount: 0,
 }
 
 storiesOf('FollowList', module)
   .addDecorator(withA11y)
   .addDecorator(helpers.layout)
   .add('without connections', () => {
-    const user = {
-      ...sevenConnectionsUser,
-      followedBy: [],
-      followedByCount: 0,
-    }
     return {
       components: { FollowList },
       store: helpers.store,
       data() {
-        return { user }
+        return { user: noConnectionsUser }
       },
-      template: `<follow-list :user="user" type="followedBy" />`,
+      template: `<div><follow-list :user="user" /><div style="margin: 1rem"></div><follow-list :user="user" type="followedBy" /></div>`,
     }
   })
   .add('with up to 7 connections', () => {
-    const user = sevenConnectionsUser
     return {
       components: { FollowList },
       store: helpers.store,
       data() {
-        return {
-          user,
-        }
+        return { user: { ...user } }
       },
       methods: {
         fetchAllConnections(type) {
-          this.user = allConnectionsUser
+          this.user[type] = allConnectionsUser[type]
           action('fetchAllConnections')(type, this.user)
         },
       },
-      template: `<follow-list :user="user" type="followedBy" @fetchAllConnections="fetchAllConnections"/>`,
+      template: `<div style="display: flex; flex-wrap: wrap;"><div style="margin: 8px;"><follow-list :user="user" @fetchAllConnections="fetchAllConnections"/></div><div style="margin: 8px;"><follow-list :user="user" type="followedBy" @fetchAllConnections="fetchAllConnections"/></div></div>`,
     }
   })
 
-  .add('with more than 7 connections', () => {
-    const user = allConnectionsUser
+  .add('with all connections', () => {
     return {
       components: { FollowList },
       store: helpers.store,
       data() {
-        return {
-          user,
-        }
+        return { user: allConnectionsUser }
       },
-      template: `<follow-list :user="user" type="followedBy" />`,
+      template: `<div style="display: flex; flex-wrap: wrap;"><div style="margin: 8px;"><follow-list :user="user" /></div><div style="margin: 8px;"><follow-list :user="user" type="followedBy"/></div></div>`,
     }
   })
diff --git a/webapp/components/features/FollowList/FollowList.vue b/webapp/components/features/FollowList/FollowList.vue
index 06ce5201f..4e3f5601d 100644
--- a/webapp/components/features/FollowList/FollowList.vue
+++ b/webapp/components/features/FollowList/FollowList.vue
@@ -117,7 +117,7 @@ export default {
 <style lang="scss">
 .follow-list {
   position: relative;
-  max-height: 424px;
+  max-height: ($size-avatar-small + $space-x-small * 2) * 8;
   width: auto;
 
   > .no-connections {
@@ -126,8 +126,8 @@ export default {
   }
 
   > .overflow-container {
-    height: $size-avatar-base * 7;
-    margin-top: -8px;
+    height: ($size-avatar-base + $space-x-small * 2) * 5;
+    margin-top: -$space-x-small;
     overflow-y: auto;
   }
 }

From 4c344ee4adf7789a5c2759c8f0710dc117732c27 Mon Sep 17 00:00:00 2001
From: Raphael Beer <raphael.beer@protonmail.com>
Date: Sun, 29 Mar 2020 11:15:53 +0200
Subject: [PATCH 28/54] Remove: client-only wrappers

---
 webapp/components/features/FollowList/FollowList.vue | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/webapp/components/features/FollowList/FollowList.vue b/webapp/components/features/FollowList/FollowList.vue
index 4e3f5601d..f34910d3a 100644
--- a/webapp/components/features/FollowList/FollowList.vue
+++ b/webapp/components/features/FollowList/FollowList.vue
@@ -10,10 +10,7 @@
     </template>
     <template v-if="connections && connections.length <= 7">
       <ds-space v-for="connection in connections" :key="connection.id" margin="x-small">
-        <!-- TODO: find better solution for rendering errors -->
-        <client-only>
-          <user-teaser :user="connection" />
-        </client-only>
+        <user-teaser :user="connection" />
       </ds-space>
       <ds-space v-if="allConnectionsCount - connections.length" margin="small">
         <base-button
@@ -33,9 +30,7 @@
     <template v-else-if="connections.length > 7">
       <div class="overflow-container">
         <ds-space v-for="connection in filteredConnections" :key="connection.id" margin="x-small">
-          <client-only>
-            <user-teaser :user="connection" />
-          </client-only>
+          <user-teaser :user="connection" />
         </ds-space>
       </div>
       <ds-space margin="x-small">

From a6484e3d0c63f3e640725ce0f0f6d026dd00bb1e Mon Sep 17 00:00:00 2001
From: Raphael Beer <raphael.beer@protonmail.com>
Date: Sun, 29 Mar 2020 12:29:55 +0200
Subject: [PATCH 29/54] Refactor: ds-space out, general markup clean

---
 .../features/FollowList/FollowList.spec.js    | 10 +-
 .../features/FollowList/FollowList.vue        | 98 ++++++++++---------
 2 files changed, 56 insertions(+), 52 deletions(-)

diff --git a/webapp/components/features/FollowList/FollowList.spec.js b/webapp/components/features/FollowList/FollowList.spec.js
index 6bda73acc..a4b51a778 100644
--- a/webapp/components/features/FollowList/FollowList.spec.js
+++ b/webapp/components/features/FollowList/FollowList.spec.js
@@ -67,14 +67,14 @@ describe('FollowList.vue', () => {
       describe('without connections', () => {
         it('displays the followingNobody message', () => {
           const wrapper = Wrapper({ user: noConnectionsUser })
-          expect(wrapper.find('.no-connections').text()).toBe(
+          expect(wrapper.find('.nobody-message').text()).toBe(
             `${noConnectionsUser.name} ${wrapper.vm.$t(`profile.network.followingNobody`)}`,
           )
         })
 
         it('displays the followedByNobody message', () => {
           const wrapper = Wrapper({ user: noConnectionsUser, type: 'followedBy' })
-          expect(wrapper.find('.no-connections').text()).toBe(
+          expect(wrapper.find('.nobody-message').text()).toBe(
             `${noConnectionsUser.name} ${wrapper.vm.$t(`profile.network.followedByNobody`)}`,
           )
         })
@@ -118,9 +118,9 @@ describe('FollowList.vue', () => {
           )
         })
 
-        it('renders the user-teaser in an overflow-container', () => {
-          expect(followingWrapper.find('.overflow-container').is('div')).toBe(true)
-          expect(followedByWrapper.find('.overflow-container').is('div')).toBe(true)
+        it('renders the user-teasers in an overflow-container', () => {
+          expect(followingWrapper.find('.--overflow').is('div')).toBe(true)
+          expect(followedByWrapper.find('.--overflow').is('div')).toBe(true)
         })
 
         it('renders a filter text input', () => {
diff --git a/webapp/components/features/FollowList/FollowList.vue b/webapp/components/features/FollowList/FollowList.vue
index f34910d3a..62fc818da 100644
--- a/webapp/components/features/FollowList/FollowList.vue
+++ b/webapp/components/features/FollowList/FollowList.vue
@@ -1,49 +1,43 @@
 <template>
   <base-card class="follow-list">
-    <ds-space v-if="connections && connections.length" margin="x-small">
-      <ds-text tag="h5" color="soft">
+    <template v-if="connections && connections.length">
+      <ds-text tag="h5" color="soft" class="spacer-x-small">
         {{ userName | truncate(15) }} {{ $t(`profile.network.${type}`) }}
       </ds-text>
-    </ds-space>
-    <template v-else>
-      <p class="no-connections">{{ userName }} {{ $t(`profile.network.${type}Nobody`) }}</p>
-    </template>
-    <template v-if="connections && connections.length <= 7">
-      <ds-space v-for="connection in connections" :key="connection.id" margin="x-small">
-        <user-teaser :user="connection" />
-      </ds-space>
-      <ds-space v-if="allConnectionsCount - connections.length" margin="small">
-        <base-button
-          @click="$emit('fetchAllConnections', type)"
-          :loading="loading"
-          size="small"
-          color="softer"
-        >
-          {{
-            $t('profile.network.andMore', {
-              number: allConnectionsCount - connections.length,
-            })
-          }}
-        </base-button>
-      </ds-space>
-    </template>
-    <template v-else-if="connections.length > 7">
-      <div class="overflow-container">
-        <ds-space v-for="connection in filteredConnections" :key="connection.id" margin="x-small">
-          <user-teaser :user="connection" />
-        </ds-space>
-      </div>
-      <ds-space margin="x-small">
-        <ds-input
-          @input.native="setFilter"
-          :placeholder="filter"
-          v-focus="true"
-          size="small"
-          icon="filter"
-          :name="`${type}Filter`"
+      <div :class="connectionsClass">
+        <user-teaser
+          v-for="connection in filteredConnections"
+          class="spacer-x-small"
+          :user="connection"
+          :key="connection.id"
         />
-      </ds-space>
+      </div>
+      <base-button
+        v-if="allConnectionsCount - connections.length"
+        @click="$emit('fetchAllConnections', type)"
+        :loading="loading"
+        size="small"
+        color="softer"
+        class="spacer-x-small"
+      >
+        {{
+          $t('profile.network.andMore', {
+            number: allConnectionsCount - connections.length,
+          })
+        }}
+      </base-button>
+      <ds-input
+        v-if="connections.length > 7"
+        @input.native="setFilter"
+        :placeholder="filter"
+        v-focus="true"
+        size="small"
+        icon="filter"
+        :name="`${type}Filter`"
+        class="spacer-x-small"
+      />
     </template>
+    <p v-else class="nobody-message">{{ userName }} {{ $t(`profile.network.${type}Nobody`) }}</p>
   </base-card>
 </template>
 
@@ -76,6 +70,10 @@ export default {
     connections() {
       return this.user[this.type]
     },
+    connectionsClass() {
+      const overflow = this.connections.length > 7 ? ' --overflow' : ''
+      return `connections${overflow}`
+    },
     filteredConnections() {
       if (!this.filter) {
         return this.connections
@@ -111,19 +109,25 @@ export default {
 
 <style lang="scss">
 .follow-list {
+  display: flex;
+  flex-direction: column;
   position: relative;
-  max-height: ($size-avatar-small + $space-x-small * 2) * 8;
+  //max-height: ($size-avatar-small + $space-x-small * 2) * 8;
   width: auto;
 
-  > .no-connections {
-    text-align: center;
-    color: $text-color-soft;
-  }
-
-  > .overflow-container {
+  .connections.--overflow {
     height: ($size-avatar-base + $space-x-small * 2) * 5;
     margin-top: -$space-x-small;
     overflow-y: auto;
   }
+
+  .nobody-message {
+    text-align: center;
+    color: $text-color-soft;
+  }
+
+  .spacer-x-small {
+    margin: $space-x-small 0;
+  }
 }
 </style>

From b05cc303b4925c26a3e7a86606764888abf5790b Mon Sep 17 00:00:00 2001
From: Raphael Beer <raphael.beer@protonmail.com>
Date: Mon, 30 Mar 2020 23:13:57 +0200
Subject: [PATCH 30/54] Fix: filter not preferring full matches in back +

  The fuzzy filter wasn't scoring full matches
  high enough, when they weren't at the
  beginning of the name.

  Given the filter 'ger', results have been:

    - (Ger)hard Burg
    - (Ge)of(r)ey
    - Armin (Ger)lach

  with this fix the are:

    - (Ger)hard Burg
    - Armin (Ger)lach
    - (Ge)of(r)ey
---
 .../features/FollowList/FollowList.story.js   |  57 +-
 .../features/FollowList/FollowList.story.json | 519 ++++++++++++++++++
 .../features/FollowList/FollowList.vue        |  19 +-
 webapp/storybook/layout.vue                   |   6 +-
 4 files changed, 593 insertions(+), 8 deletions(-)
 create mode 100644 webapp/components/features/FollowList/FollowList.story.json

diff --git a/webapp/components/features/FollowList/FollowList.story.js b/webapp/components/features/FollowList/FollowList.story.js
index 0d117df95..efdbaed3b 100644
--- a/webapp/components/features/FollowList/FollowList.story.js
+++ b/webapp/components/features/FollowList/FollowList.story.js
@@ -5,6 +5,8 @@ import { action } from '@storybook/addon-actions'
 import helpers from '~/storybook/helpers'
 import FollowList from './FollowList.vue'
 
+import fuzzyFilterUser from './FollowList.story.json'
+
 helpers.init()
 
 const user = {
@@ -30,6 +32,12 @@ const noConnectionsUser = {
   followingCount: 0,
 }
 
+const wrapTemplates = (templates) => `
+<div style="display: flex; flex-wrap: wrap;">
+${templates.map((template) => `<div style="margin: 8px;">${template}</div>`).join('')}
+</div>
+`
+
 storiesOf('FollowList', module)
   .addDecorator(withA11y)
   .addDecorator(helpers.layout)
@@ -40,7 +48,10 @@ storiesOf('FollowList', module)
       data() {
         return { user: noConnectionsUser }
       },
-      template: `<div><follow-list :user="user" /><div style="margin: 1rem"></div><follow-list :user="user" type="followedBy" /></div>`,
+      template: wrapTemplates([
+        '<follow-list :user="user" />',
+        '<follow-list :user="user" type="followedBy" />',
+      ]),
     }
   })
   .add('with up to 7 connections', () => {
@@ -56,7 +67,10 @@ storiesOf('FollowList', module)
           action('fetchAllConnections')(type, this.user)
         },
       },
-      template: `<div style="display: flex; flex-wrap: wrap;"><div style="margin: 8px;"><follow-list :user="user" @fetchAllConnections="fetchAllConnections"/></div><div style="margin: 8px;"><follow-list :user="user" type="followedBy" @fetchAllConnections="fetchAllConnections"/></div></div>`,
+      template: wrapTemplates([
+        '<follow-list :user="user" @fetchAllConnections="fetchAllConnections"/>',
+        '<follow-list :user="user" type="followedBy" @fetchAllConnections="fetchAllConnections"/>',
+      ]),
     }
   })
 
@@ -67,6 +81,43 @@ storiesOf('FollowList', module)
       data() {
         return { user: allConnectionsUser }
       },
-      template: `<div style="display: flex; flex-wrap: wrap;"><div style="margin: 8px;"><follow-list :user="user" /></div><div style="margin: 8px;"><follow-list :user="user" type="followedBy"/></div></div>`,
+      template: wrapTemplates([
+        '<follow-list :user="user" />',
+        '<follow-list :user="user" type="followedBy"/>',
+      ]),
+    }
+  })
+  .add('with a lot of connections', () => {
+    return {
+      components: { FollowList },
+      store: helpers.store,
+      data() {
+        return {
+          user: {
+            ...user,
+            followedByCount: 1000,
+            followingCount: 1000,
+            followedBy: helpers.fakeUser(1000),
+            following: helpers.fakeUser(1000),
+          },
+        }
+      },
+      template: wrapTemplates([
+        '<follow-list :user="user" />',
+        '<follow-list :user="user" type="followedBy"/>',
+      ]),
+    }
+  })
+  .add('Fuzzy Filter', () => {
+    return {
+      components: { FollowList },
+      store: helpers.store,
+      data() {
+        return { user: fuzzyFilterUser }
+      },
+      template: wrapTemplates([
+        '<follow-list :user="user" />',
+        '<follow-list :user="user" type="followedBy">',
+      ]),
     }
   })
diff --git a/webapp/components/features/FollowList/FollowList.story.json b/webapp/components/features/FollowList/FollowList.story.json
new file mode 100644
index 000000000..e3055e6e2
--- /dev/null
+++ b/webapp/components/features/FollowList/FollowList.story.json
@@ -0,0 +1,519 @@
+{
+  "id": "u3",
+  "slug": "jenny-rostock",
+  "name": "Jenny Rostock",
+  "avatar": {
+    "url": "https://s3.amazonaws.com/uifaces/faces/twitter/nessoila/128.jpg?random=16aba55f-48c6-4ef5-966a-af0e31693e6a"
+  },
+  "followedByCount": 32,
+  "followingCount": 31,
+  "following": [
+    {
+      "id": "8c0b0191-454a-4806-b0c3-1ed1d9dc5416",
+      "slug": "wanda-stanton-sr",
+      "name": "Wanda Stanton Sr.",
+      "avatar": {
+        "url": "https://s3.amazonaws.com/uifaces/faces/twitter/nicolasfolliot/128.jpg?random=be2e59fb-f038-44d5-9e21-28fb123e8c7c"
+      }
+    },
+    {
+      "id": "6f4fdb51-fe93-4373-bf44-c36ea17f6535",
+      "slug": "walter-ohara",
+      "name": "Walter O'Hara",
+      "avatar": {
+        "url": "https://s3.amazonaws.com/uifaces/faces/twitter/mutlu82/128.jpg?random=0866e1b7-8285-4eaf-a4c8-8509bd99f172"
+      }
+    },
+    {
+      "id": "20f5080b-1fc2-4c70-94c7-badbe2aa2370",
+      "slug": "hannah-bradtke",
+      "name": "Hannah Bradtke",
+      "avatar": {
+        "url": "https://s3.amazonaws.com/uifaces/faces/twitter/Skyhartman/128.jpg?random=c02415a6-1e7e-488a-acb6-47587399ff07"
+      }
+    },
+    {
+      "id": "c5d2c492-5b8c-41a5-a9a2-26f8c866a885",
+      "slug": "georgia-koss-dvm",
+      "name": "Georgia Koss DVM",
+      "avatar": {
+        "url": "https://s3.amazonaws.com/uifaces/faces/twitter/lvovenok/128.jpg?random=8e1e75b9-5dad-4fc8-9c52-38b89a3e0484"
+      }
+    },
+    {
+      "id": "f4c10451-f367-4afb-97fe-e48f60236655",
+      "slug": "genevieve-aufderhar-v",
+      "name": "Genevieve Aufderhar V",
+      "avatar": {
+        "url": "https://s3.amazonaws.com/uifaces/faces/twitter/dss49/128.jpg?random=fc59a664-d2b4-4677-81e9-26ed5d4bc37e"
+      }
+    },
+    {
+      "id": "df65a474-b661-4fd8-b49f-2d609bfc4089",
+      "slug": "wanda-gerlach",
+      "name": "Wanda Gerlach",
+      "avatar": {
+        "url": "https://s3.amazonaws.com/uifaces/faces/twitter/lewisainslie/128.jpg?random=5f0976d5-7871-4606-a416-6b67b0e67c15"
+      }
+    },
+    {
+      "id": "5f2b3c14-07fc-4dfa-978e-9bf21d8586d0",
+      "slug": "roland-kohler",
+      "name": "Roland Kohler",
+      "avatar": {
+        "url": "https://s3.amazonaws.com/uifaces/faces/twitter/bcrad/128.jpg?random=4f77c5b2-0214-4342-a18e-424787f04896"
+      }
+    },
+    {
+      "id": "a2c49c22-940a-4598-8285-b8ebb34bd045",
+      "slug": "krista-hammes-dvm",
+      "name": "Krista Hammes DVM",
+      "avatar": {
+        "url": "https://s3.amazonaws.com/uifaces/faces/twitter/sterlingrules/128.jpg?random=28167137-eee4-42e6-98a3-ec9a7d4b9509"
+      }
+    },
+    {
+      "id": "da70bae8-daf2-4481-b2db-506d00b73210",
+      "slug": "miss-lester-kovacek",
+      "name": "Miss Lester Kovacek",
+      "avatar": {
+        "url": "https://s3.amazonaws.com/uifaces/faces/twitter/stefvdham/128.jpg?random=7de26019-8114-4caa-9aea-2172ae3c537c"
+      }
+    },
+    {
+      "id": "868952d8-c5df-4415-a0bb-930acd26749c",
+      "slug": "teri-stamm-iii",
+      "name": "Teri Stamm III",
+      "avatar": {
+        "url": "https://s3.amazonaws.com/uifaces/faces/twitter/salimianoff/128.jpg?random=d2305511-39b2-4207-bee6-90799557546e"
+      }
+    },
+    {
+      "id": "7a569786-fbb1-4e27-8f2c-38d2a0963b9d",
+      "slug": "gerardo-batz",
+      "name": "Gerardo Batz",
+      "avatar": {
+        "url": "https://s3.amazonaws.com/uifaces/faces/twitter/colirpixoil/128.jpg?random=8536b980-103e-4e5e-8141-31142e3c6330"
+      }
+    },
+    {
+      "id": "dca673f2-89b8-46cc-a836-2515f319c02f",
+      "slug": "carlton-botsford",
+      "name": "Carlton Botsford",
+      "avatar": {
+        "url": "https://s3.amazonaws.com/uifaces/faces/twitter/cocolero/128.jpg?random=3ef57800-7694-4ec4-a9eb-39abca8d59e4"
+      }
+    },
+    {
+      "id": "58ba4ab0-990e-4f44-a7a8-42d10962f8b7",
+      "slug": "edward-boehm",
+      "name": "Edward Boehm",
+      "avatar": {
+        "url": "https://s3.amazonaws.com/uifaces/faces/twitter/d_nny_m_cher/128.jpg?random=cf3ba671-4564-4dc1-bf94-a5fc3ea4fafa"
+      }
+    },
+    {
+      "id": "u4",
+      "slug": "huey",
+      "name": "Huey",
+      "avatar": {
+        "url": "https://s3.amazonaws.com/uifaces/faces/twitter/hellofeverrrr/128.jpg?random=46fef3a9-44a0-4784-9854-03be6b3f37e1"
+      }
+    },
+    {
+      "id": "40cf7e21-a4dc-4055-a49d-3137c53dd815",
+      "slug": "ms-laurie-bergnaum",
+      "name": "Ms. Laurie Bergnaum",
+      "avatar": {
+        "url": "https://s3.amazonaws.com/uifaces/faces/twitter/kohette/128.jpg?random=45516cde-9073-4ceb-8b42-2bdf66a26c67"
+      }
+    },
+    {
+      "id": "4c377f54-72c3-4e13-9532-6d0f2278a794",
+      "slug": "jeffery-waelchi",
+      "name": "Jeffery Waelchi",
+      "avatar": {
+        "url": "https://s3.amazonaws.com/uifaces/faces/twitter/andresenfredrik/128.jpg?random=b643d8ba-5e49-4854-b2a6-2ff609ffcba0"
+      }
+    },
+    {
+      "id": "d861e775-2344-40d5-b6e4-8479e7dbe97f",
+      "slug": "marvin-gutkowski-iii",
+      "name": "Marvin Gutkowski III",
+      "avatar": {
+        "url": "https://s3.amazonaws.com/uifaces/faces/twitter/kiwiupover/128.jpg?random=d38c1508-0342-46e0-9ef9-e0fd14b33072"
+      }
+    },
+    {
+      "id": "3102346c-ea94-41d3-8474-5241e5e473a6",
+      "slug": "edmund-rolfson-jr",
+      "name": "Edmund Rolfson Jr.",
+      "avatar": {
+        "url": "https://s3.amazonaws.com/uifaces/faces/twitter/nerrsoft/128.jpg?random=d6f0804c-f38f-4c8b-821d-27a02373c74e"
+      }
+    },
+    {
+      "id": "0290fd5e-7ce8-4d70-8c29-f5ed96bfaa1f",
+      "slug": "bert-oconner",
+      "name": "Bert O'Conner",
+      "avatar": {
+        "url": "https://s3.amazonaws.com/uifaces/faces/twitter/mangosango/128.jpg?random=03807c6c-c2f6-4ed3-8433-7a1823079eb0"
+      }
+    },
+    {
+      "id": "9fe670ff-1968-4b15-ab80-7adee8173dd8",
+      "slug": "angela-schiller",
+      "name": "Angela Schiller",
+      "avatar": {
+        "url": "https://s3.amazonaws.com/uifaces/faces/twitter/dudestein/128.jpg?random=0b511fa4-8603-419a-acf0-2a89bc41a71b"
+      }
+    },
+    {
+      "id": "63798c79-2476-4eb8-a09c-167420bd05d7",
+      "slug": "peggy-carter",
+      "name": "Peggy Carter",
+      "avatar": {
+        "url": "https://s3.amazonaws.com/uifaces/faces/twitter/uxpiper/128.jpg?random=c4dc0de5-99d7-410d-8088-6a2be8358fe9"
+      }
+    },
+    {
+      "id": "4d3fbb67-7ddc-4aa9-96d0-57bb20f95f59",
+      "slug": "krystal-braun",
+      "name": "Krystal Braun",
+      "avatar": {
+        "url": "https://s3.amazonaws.com/uifaces/faces/twitter/salvafc/128.jpg?random=1dbd4549-a525-4fa3-be41-15db84ceb41a"
+      }
+    },
+    {
+      "id": "bcd5f271-bca5-492e-a6b6-7fd490ac37aa",
+      "slug": "janet-bruen",
+      "name": "Janet Bruen",
+      "avatar": {
+        "url": "https://s3.amazonaws.com/uifaces/faces/twitter/yigitpinarbasi/128.jpg?random=3c7ab2c0-8e53-4edb-8c74-fd8cdfae5f8e"
+      }
+    },
+    {
+      "id": "38ccbf58-305a-4400-a1e4-785661604d5f",
+      "slug": "ebony-corwin",
+      "name": "Ebony Corwin",
+      "avatar": {
+        "url": "https://s3.amazonaws.com/uifaces/faces/twitter/thibaut_re/128.jpg?random=f2137643-6f58-45b8-8266-d1fb893d0528"
+      }
+    },
+    {
+      "id": "5137e045-aef0-4ce1-8327-b516a72fffd6",
+      "slug": "terrell-gorczany",
+      "name": "Terrell Gorczany",
+      "avatar": {
+        "url": "https://s3.amazonaws.com/uifaces/faces/twitter/jimmuirhead/128.jpg?random=5e61976f-529e-47f2-b4f0-b5e4550942ea"
+      }
+    },
+    {
+      "id": "b224eb01-5a71-4126-b811-51b7b35afd51",
+      "slug": "dr-jamie-romaguera",
+      "name": "Dr. Jamie Romaguera",
+      "avatar": {
+        "url": "https://s3.amazonaws.com/uifaces/faces/twitter/leonfedotov/128.jpg?random=9179538d-58be-4707-8ad6-485f703bea26"
+      }
+    },
+    {
+      "id": "fdbb3e7f-f211-4685-831e-9d7e394b95a1",
+      "slug": "shannon-schuster",
+      "name": "Shannon Schuster",
+      "avatar": {
+        "url": "https://s3.amazonaws.com/uifaces/faces/twitter/markretzloff/128.jpg?random=f8a223ff-d49f-499f-a161-350e8078c353"
+      }
+    },
+    {
+      "id": "d7ee00ea-5d22-4a1c-8670-7e4d4bd4ebfa",
+      "slug": "guadalupe-kessler",
+      "name": "Guadalupe Kessler",
+      "avatar": {
+        "url": "https://s3.amazonaws.com/uifaces/faces/twitter/linux29/128.jpg?random=a87d13e1-ff0e-4a39-a018-e89a04d72572"
+      }
+    },
+    {
+      "id": "49b868e3-dba5-48ed-8b6c-e686c70dfcfb",
+      "slug": "lonnie-rogahn",
+      "name": "Lonnie Rogahn",
+      "avatar": {
+        "url": "https://s3.amazonaws.com/uifaces/faces/twitter/herbigt/128.jpg?random=fde8a699-624d-4052-96ef-0aaacf217184"
+      }
+    },
+    {
+      "id": "fa70eecb-fbae-4133-b447-6c80b335fc01",
+      "slug": "marcella-ledner",
+      "name": "Marcella Ledner",
+      "avatar": {
+        "url": "https://s3.amazonaws.com/uifaces/faces/twitter/dawidwu/128.jpg?random=03869abc-1a6b-4f26-8d73-7ba508c148d0"
+      }
+    },
+    {
+      "id": "ef4cc540-c784-407f-b646-cff4d8fe666e",
+      "slug": "darrell-runolfsson",
+      "name": "Darrell Runolfsson",
+      "avatar": {
+        "url": "https://s3.amazonaws.com/uifaces/faces/twitter/andrewofficer/128.jpg?random=e6c24db9-f1c9-45b5-8507-609fca960e92"
+      }
+    }
+  ],
+  "followedBy": [
+    {
+      "id": "8c0b0191-454a-4806-b0c3-1ed1d9dc5416",
+      "slug": "wanda-stanton-sr",
+      "name": "Wanda Stanton Sr.",
+      "avatar": {
+        "url": "https://s3.amazonaws.com/uifaces/faces/twitter/nicolasfolliot/128.jpg?random=be2e59fb-f038-44d5-9e21-28fb123e8c7c"
+      }
+    },
+    {
+      "id": "c5d2c492-5b8c-41a5-a9a2-26f8c866a885",
+      "slug": "georgia-koss-dvm",
+      "name": "Georgia Koss DVM",
+      "avatar": {
+        "url": "https://s3.amazonaws.com/uifaces/faces/twitter/lvovenok/128.jpg?random=8e1e75b9-5dad-4fc8-9c52-38b89a3e0484"
+      }
+    },
+    {
+      "id": "5f2b3c14-07fc-4dfa-978e-9bf21d8586d0",
+      "slug": "roland-kohler",
+      "name": "Roland Kohler",
+      "avatar": {
+        "url": "https://s3.amazonaws.com/uifaces/faces/twitter/bcrad/128.jpg?random=4f77c5b2-0214-4342-a18e-424787f04896"
+      }
+    },
+    {
+      "id": "6f4fdb51-fe93-4373-bf44-c36ea17f6535",
+      "slug": "walter-ohara",
+      "name": "Walter O'Hara",
+      "avatar": {
+        "url": "https://s3.amazonaws.com/uifaces/faces/twitter/mutlu82/128.jpg?random=0866e1b7-8285-4eaf-a4c8-8509bd99f172"
+      }
+    },
+    {
+      "id": "20f5080b-1fc2-4c70-94c7-badbe2aa2370",
+      "slug": "hannah-bradtke",
+      "name": "Hannah Bradtke",
+      "avatar": {
+        "url": "https://s3.amazonaws.com/uifaces/faces/twitter/Skyhartman/128.jpg?random=c02415a6-1e7e-488a-acb6-47587399ff07"
+      }
+    },
+    {
+      "id": "df65a474-b661-4fd8-b49f-2d609bfc4089",
+      "slug": "wanda-gerlach",
+      "name": "Wanda Gerlach",
+      "avatar": {
+        "url": "https://s3.amazonaws.com/uifaces/faces/twitter/lewisainslie/128.jpg?random=5f0976d5-7871-4606-a416-6b67b0e67c15"
+      }
+    },
+    {
+      "id": "f4c10451-f367-4afb-97fe-e48f60236655",
+      "slug": "genevieve-aufderhar-v",
+      "name": "Genevieve Aufderhar V",
+      "avatar": {
+        "url": "https://s3.amazonaws.com/uifaces/faces/twitter/dss49/128.jpg?random=fc59a664-d2b4-4677-81e9-26ed5d4bc37e"
+      }
+    },
+    {
+      "id": "7a569786-fbb1-4e27-8f2c-38d2a0963b9d",
+      "slug": "gerardo-batz",
+      "name": "Gerardo Batz",
+      "avatar": {
+        "url": "https://s3.amazonaws.com/uifaces/faces/twitter/colirpixoil/128.jpg?random=8536b980-103e-4e5e-8141-31142e3c6330"
+      }
+    },
+    {
+      "id": "da70bae8-daf2-4481-b2db-506d00b73210",
+      "slug": "miss-lester-kovacek",
+      "name": "Miss Lester Kovacek",
+      "avatar": {
+        "url": "https://s3.amazonaws.com/uifaces/faces/twitter/stefvdham/128.jpg?random=7de26019-8114-4caa-9aea-2172ae3c537c"
+      }
+    },
+    {
+      "id": "a2c49c22-940a-4598-8285-b8ebb34bd045",
+      "slug": "krista-hammes-dvm",
+      "name": "Krista Hammes DVM",
+      "avatar": {
+        "url": "https://s3.amazonaws.com/uifaces/faces/twitter/sterlingrules/128.jpg?random=28167137-eee4-42e6-98a3-ec9a7d4b9509"
+      }
+    },
+    {
+      "id": "bcd5f271-bca5-492e-a6b6-7fd490ac37aa",
+      "slug": "janet-bruen",
+      "name": "Janet Bruen",
+      "avatar": {
+        "url": "https://s3.amazonaws.com/uifaces/faces/twitter/yigitpinarbasi/128.jpg?random=3c7ab2c0-8e53-4edb-8c74-fd8cdfae5f8e"
+      }
+    },
+    {
+      "id": "38ccbf58-305a-4400-a1e4-785661604d5f",
+      "slug": "ebony-corwin",
+      "name": "Ebony Corwin",
+      "avatar": {
+        "url": "https://s3.amazonaws.com/uifaces/faces/twitter/thibaut_re/128.jpg?random=f2137643-6f58-45b8-8266-d1fb893d0528"
+      }
+    },
+    {
+      "id": "d7ee00ea-5d22-4a1c-8670-7e4d4bd4ebfa",
+      "slug": "guadalupe-kessler",
+      "name": "Guadalupe Kessler",
+      "avatar": {
+        "url": "https://s3.amazonaws.com/uifaces/faces/twitter/linux29/128.jpg?random=a87d13e1-ff0e-4a39-a018-e89a04d72572"
+      }
+    },
+    {
+      "id": "dca673f2-89b8-46cc-a836-2515f319c02f",
+      "slug": "carlton-botsford",
+      "name": "Carlton Botsford",
+      "avatar": {
+        "url": "https://s3.amazonaws.com/uifaces/faces/twitter/cocolero/128.jpg?random=3ef57800-7694-4ec4-a9eb-39abca8d59e4"
+      }
+    },
+    {
+      "id": "49b868e3-dba5-48ed-8b6c-e686c70dfcfb",
+      "slug": "lonnie-rogahn",
+      "name": "Lonnie Rogahn",
+      "avatar": {
+        "url": "https://s3.amazonaws.com/uifaces/faces/twitter/herbigt/128.jpg?random=fde8a699-624d-4052-96ef-0aaacf217184"
+      }
+    },
+    {
+      "id": "4d3fbb67-7ddc-4aa9-96d0-57bb20f95f59",
+      "slug": "krystal-braun",
+      "name": "Krystal Braun",
+      "avatar": {
+        "url": "https://s3.amazonaws.com/uifaces/faces/twitter/salvafc/128.jpg?random=1dbd4549-a525-4fa3-be41-15db84ceb41a"
+      }
+    },
+    {
+      "id": "58ba4ab0-990e-4f44-a7a8-42d10962f8b7",
+      "slug": "edward-boehm",
+      "name": "Edward Boehm",
+      "avatar": {
+        "url": "https://s3.amazonaws.com/uifaces/faces/twitter/d_nny_m_cher/128.jpg?random=cf3ba671-4564-4dc1-bf94-a5fc3ea4fafa"
+      }
+    },
+    {
+      "id": "868952d8-c5df-4415-a0bb-930acd26749c",
+      "slug": "teri-stamm-iii",
+      "name": "Teri Stamm III",
+      "avatar": {
+        "url": "https://s3.amazonaws.com/uifaces/faces/twitter/salimianoff/128.jpg?random=d2305511-39b2-4207-bee6-90799557546e"
+      }
+    },
+    {
+      "id": "fa70eecb-fbae-4133-b447-6c80b335fc01",
+      "slug": "marcella-ledner",
+      "name": "Marcella Ledner",
+      "avatar": {
+        "url": "https://s3.amazonaws.com/uifaces/faces/twitter/dawidwu/128.jpg?random=03869abc-1a6b-4f26-8d73-7ba508c148d0"
+      }
+    },
+    {
+      "id": "63798c79-2476-4eb8-a09c-167420bd05d7",
+      "slug": "peggy-carter",
+      "name": "Peggy Carter",
+      "avatar": {
+        "url": "https://s3.amazonaws.com/uifaces/faces/twitter/uxpiper/128.jpg?random=c4dc0de5-99d7-410d-8088-6a2be8358fe9"
+      }
+    },
+    {
+      "id": "9fe670ff-1968-4b15-ab80-7adee8173dd8",
+      "slug": "angela-schiller",
+      "name": "Angela Schiller",
+      "avatar": {
+        "url": "https://s3.amazonaws.com/uifaces/faces/twitter/dudestein/128.jpg?random=0b511fa4-8603-419a-acf0-2a89bc41a71b"
+      }
+    },
+    {
+      "id": "fdbb3e7f-f211-4685-831e-9d7e394b95a1",
+      "slug": "shannon-schuster",
+      "name": "Shannon Schuster",
+      "avatar": {
+        "url": "https://s3.amazonaws.com/uifaces/faces/twitter/markretzloff/128.jpg?random=f8a223ff-d49f-499f-a161-350e8078c353"
+      }
+    },
+    {
+      "id": "5137e045-aef0-4ce1-8327-b516a72fffd6",
+      "slug": "terrell-gorczany",
+      "name": "Terrell Gorczany",
+      "avatar": {
+        "url": "https://s3.amazonaws.com/uifaces/faces/twitter/jimmuirhead/128.jpg?random=5e61976f-529e-47f2-b4f0-b5e4550942ea"
+      }
+    },
+    {
+      "id": "ef4cc540-c784-407f-b646-cff4d8fe666e",
+      "slug": "darrell-runolfsson",
+      "name": "Darrell Runolfsson",
+      "avatar": {
+        "url": "https://s3.amazonaws.com/uifaces/faces/twitter/andrewofficer/128.jpg?random=e6c24db9-f1c9-45b5-8507-609fca960e92"
+      }
+    },
+    {
+      "id": "b224eb01-5a71-4126-b811-51b7b35afd51",
+      "slug": "dr-jamie-romaguera",
+      "name": "Dr. Jamie Romaguera",
+      "avatar": {
+        "url": "https://s3.amazonaws.com/uifaces/faces/twitter/leonfedotov/128.jpg?random=9179538d-58be-4707-8ad6-485f703bea26"
+      }
+    },
+    {
+      "id": "u1",
+      "slug": "peter-lustig",
+      "name": "Peter Lustig",
+      "avatar": {
+        "url": "https://s3.amazonaws.com/uifaces/faces/twitter/timgthomas/128.jpg?random=189d17f8-02d1-4b01-a000-af7121ae6897"
+      }
+    },
+    {
+      "id": "u6",
+      "slug": "louie",
+      "name": "Louie",
+      "avatar": {
+        "url": "https://s3.amazonaws.com/uifaces/faces/twitter/yayteejay/128.jpg?random=eefe597c-d49a-494f-b311-d6f2645d2264"
+      }
+    },
+    {
+      "id": "3102346c-ea94-41d3-8474-5241e5e473a6",
+      "slug": "edmund-rolfson-jr",
+      "name": "Edmund Rolfson Jr.",
+      "avatar": {
+        "url": "https://s3.amazonaws.com/uifaces/faces/twitter/nerrsoft/128.jpg?random=d6f0804c-f38f-4c8b-821d-27a02373c74e"
+      }
+    },
+    {
+      "id": "40cf7e21-a4dc-4055-a49d-3137c53dd815",
+      "slug": "ms-laurie-bergnaum",
+      "name": "Ms. Laurie Bergnaum",
+      "avatar": {
+        "url": "https://s3.amazonaws.com/uifaces/faces/twitter/kohette/128.jpg?random=45516cde-9073-4ceb-8b42-2bdf66a26c67"
+      }
+    },
+    {
+      "id": "d861e775-2344-40d5-b6e4-8479e7dbe97f",
+      "slug": "marvin-gutkowski-iii",
+      "name": "Marvin Gutkowski III",
+      "avatar": {
+        "url": "https://s3.amazonaws.com/uifaces/faces/twitter/kiwiupover/128.jpg?random=d38c1508-0342-46e0-9ef9-e0fd14b33072"
+      }
+    },
+    {
+      "id": "4c377f54-72c3-4e13-9532-6d0f2278a794",
+      "slug": "jeffery-waelchi",
+      "name": "Jeffery Waelchi",
+      "avatar": {
+        "url": "https://s3.amazonaws.com/uifaces/faces/twitter/andresenfredrik/128.jpg?random=b643d8ba-5e49-4854-b2a6-2ff609ffcba0"
+      }
+    },
+    {
+      "id": "0290fd5e-7ce8-4d70-8c29-f5ed96bfaa1f",
+      "slug": "bert-oconner",
+      "name": "Bert O'Conner",
+      "avatar": {
+        "url": "https://s3.amazonaws.com/uifaces/faces/twitter/mangosango/128.jpg?random=03807c6c-c2f6-4ed3-8433-7a1823079eb0"
+      }
+    }
+  ]
+}
+
diff --git a/webapp/components/features/FollowList/FollowList.vue b/webapp/components/features/FollowList/FollowList.vue
index 62fc818da..66b6e7c1e 100644
--- a/webapp/components/features/FollowList/FollowList.vue
+++ b/webapp/components/features/FollowList/FollowList.vue
@@ -42,6 +42,7 @@
 </template>
 
 <script>
+import { escape } from 'xregexp/xregexp-all.js'
 import UserTeaser from '~/components/UserTeaser/UserTeaser'
 
 export default {
@@ -79,8 +80,11 @@ export default {
         return this.connections
       }
 
+      // @example
+      //  this.filter = 'foo';
+      //  fuzzyExpression = /([^f]*f)([^o]*o)([^o]*o)/i
       const fuzzyExpression = new RegExp(
-        `${this.filter.split('').reduce((part, c) => `${part}[^${c}]*${c}`)}`,
+        `${this.filter.split('').reduce((expr, c) => `${expr}([^${escape(c)}]*${escape(c)})`, '')}`,
         'i',
       )
 
@@ -88,12 +92,21 @@ export default {
         .map((user) => {
           const match = user.name.match(fuzzyExpression)
 
+          if (!match) {
+            return false
+          }
+
+          let score = 1
+          for (let i = 1; i <= this.filter.length; i++) {
+            score *= match[i].length
+          }
+
           return {
             user,
-            score: match ? match[0].length * (match.index + 1) : -1,
+            score,
           }
         })
-        .filter((score) => score.score !== -1)
+        .filter(Boolean)
         .sort((a, b) => a.score - b.score)
 
       return fuzzyScores.map((score) => score.user)
diff --git a/webapp/storybook/layout.vue b/webapp/storybook/layout.vue
index f8f3d77ea..b885d7f73 100644
--- a/webapp/storybook/layout.vue
+++ b/webapp/storybook/layout.vue
@@ -1,7 +1,7 @@
 <template>
-  <ds-container class="container">
+  <div class="container">
     <slot />
-  </ds-container>
+  </div>
 </template>
 
 <style lang="scss">
@@ -10,5 +10,7 @@
 
 .container {
   padding: 5rem;
+  max-width: 1200px;
+  margin: 0 auto;
 }
 </style>

From daa88168bb2cbb66e79e5aab19327c3242b410d3 Mon Sep 17 00:00:00 2001
From: Raphael Beer <raphael.beer@protonmail.com>
Date: Wed, 1 Apr 2020 08:43:11 +0200
Subject: [PATCH 31/54] Change: test effects of type prop

---
 .../features/FollowList/FollowList.spec.js    | 65 ++++++++++++-------
 1 file changed, 41 insertions(+), 24 deletions(-)

diff --git a/webapp/components/features/FollowList/FollowList.spec.js b/webapp/components/features/FollowList/FollowList.spec.js
index a4b51a778..35c9271ca 100644
--- a/webapp/components/features/FollowList/FollowList.spec.js
+++ b/webapp/components/features/FollowList/FollowList.spec.js
@@ -63,6 +63,37 @@ describe('FollowList.vue', () => {
       })
     })
 
+    describe('given a type', () => {
+      describe('of `following`', () => {
+        it('uses the `following` data on :user', () => {
+          const wrapper = Wrapper({ user, type: 'following' })
+          wrapper.find('.base-button').trigger('click')
+
+          expect(wrapper.vm.connections).toEqual(user.following)
+          expect(wrapper.vm.allConnectionsCount).toBe(user.followingCount)
+          expect(wrapper.emitted('fetchAllConnections')).toEqual([['following']])
+        })
+      })
+
+      describe('of `followedBy`', () => {
+        it('uses the `followedBy` data on :user', () => {
+          const wrapper = Wrapper({ type: 'followedBy' })
+          wrapper.find('.base-button').trigger('click')
+
+          expect(wrapper.vm.connections).toEqual(user.followedBy)
+          expect(wrapper.vm.allConnectionsCount).toBe(user.followedByCount)
+          expect(wrapper.emitted('fetchAllConnections')).toEqual([['followedBy']])
+        })
+      })
+    })
+
+    describe('given no type', () => {
+      it('defaults type to `following`', () => {
+        const wrapper = Wrapper()
+        expect(wrapper.vm.type).toBe('following')
+      })
+    })
+
     describe('given a user', () => {
       describe('without connections', () => {
         it('displays the followingNobody message', () => {
@@ -81,51 +112,37 @@ describe('FollowList.vue', () => {
       })
 
       describe('with up to 7 loaded connections', () => {
-        let followingWrapper
-        let followedByWrapper
+        let wrapper
         beforeAll(() => {
-          followingWrapper = Wrapper()
-          followedByWrapper = Wrapper({ type: 'followedBy' })
+          wrapper = Wrapper()
         })
 
         it(`renders the connections`, () => {
-          expect(followedByWrapper.findAll('.user-teaser').length).toEqual(user.followedBy.length)
-          expect(followingWrapper.findAll('.user-teaser').length).toEqual(user.following.length)
+          expect(wrapper.findAll('.user-teaser').length).toEqual(user.following.length)
         })
 
         it(`has a button to load all remaining connections`, async () => {
-          followingWrapper.find('.base-button').trigger('click')
-          followedByWrapper.find('.base-button').trigger('click')
-          expect(followingWrapper.emitted('fetchAllConnections')).toBeTruthy()
-          expect(followedByWrapper.emitted('fetchAllConnections')).toBeTruthy()
+          wrapper.find('.base-button').trigger('click')
+          expect(wrapper.emitted('fetchAllConnections')).toBeTruthy()
         })
       })
 
       describe('with more than 7 loaded connections', () => {
-        let followingWrapper
-        let followedByWrapper
+        let wrapper
         beforeAll(() => {
-          followingWrapper = Wrapper({ user: allConnectionsUser })
-          followedByWrapper = Wrapper({ user: allConnectionsUser, type: 'followedBy' })
+          wrapper = Wrapper({ user: allConnectionsUser })
         })
 
         it('renders the connections', () => {
-          expect(followedByWrapper.findAll('.user-teaser')).toHaveLength(
-            allConnectionsUser.followedByCount,
-          )
-          expect(followingWrapper.findAll('.user-teaser')).toHaveLength(
-            allConnectionsUser.followingCount,
-          )
+          expect(wrapper.findAll('.user-teaser')).toHaveLength(allConnectionsUser.followingCount)
         })
 
         it('renders the user-teasers in an overflow-container', () => {
-          expect(followingWrapper.find('.--overflow').is('div')).toBe(true)
-          expect(followedByWrapper.find('.--overflow').is('div')).toBe(true)
+          expect(wrapper.find('.--overflow').is('div')).toBe(true)
         })
 
         it('renders a filter text input', () => {
-          expect(followingWrapper.find('[name="followingFilter"]').is('input')).toBe(true)
-          expect(followedByWrapper.find('[name="followedByFilter"]').is('input')).toBe(true)
+          expect(wrapper.find('[name="followingFilter"]').is('input')).toBe(true)
         })
       })
     })

From 8e985703bdf5498566a2f5da7e310942763ab897 Mon Sep 17 00:00:00 2001
From: Raphael Beer <raphael.beer@protonmail.com>
Date: Wed, 1 Apr 2020 09:01:59 +0200
Subject: [PATCH 32/54] Refactor: apply vuejs styleguide attribute order

---
 webapp/components/features/FollowList/FollowList.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/webapp/components/features/FollowList/FollowList.vue b/webapp/components/features/FollowList/FollowList.vue
index 66b6e7c1e..d6b62856b 100644
--- a/webapp/components/features/FollowList/FollowList.vue
+++ b/webapp/components/features/FollowList/FollowList.vue
@@ -7,18 +7,18 @@
       <div :class="connectionsClass">
         <user-teaser
           v-for="connection in filteredConnections"
-          class="spacer-x-small"
           :user="connection"
           :key="connection.id"
+          class="spacer-x-small"
         />
       </div>
       <base-button
         v-if="allConnectionsCount - connections.length"
-        @click="$emit('fetchAllConnections', type)"
         :loading="loading"
         size="small"
         color="softer"
         class="spacer-x-small"
+        @click="$emit('fetchAllConnections', type)"
       >
         {{
           $t('profile.network.andMore', {
@@ -28,13 +28,13 @@
       </base-button>
       <ds-input
         v-if="connections.length > 7"
-        @input.native="setFilter"
-        :placeholder="filter"
         v-focus="true"
+        :placeholder="filter"
         size="small"
         icon="filter"
         :name="`${type}Filter`"
         class="spacer-x-small"
+        @input.native="setFilter"
       />
     </template>
     <p v-else class="nobody-message">{{ userName }} {{ $t(`profile.network.${type}Nobody`) }}</p>

From 9dd65aa6d55df1bb668ed12c409c2bd4119adc2e Mon Sep 17 00:00:00 2001
From: Raphael Beer <raphael.beer@protonmail.com>
Date: Wed, 1 Apr 2020 09:40:07 +0200
Subject: [PATCH 33/54] Remove: redundant defaults

---
 webapp/pages/profile/_id/_slug.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/webapp/pages/profile/_id/_slug.vue b/webapp/pages/profile/_id/_slug.vue
index b3f056a3d..36ef1ba10 100644
--- a/webapp/pages/profile/_id/_slug.vue
+++ b/webapp/pages/profile/_id/_slug.vue
@@ -270,6 +270,7 @@ export default {
     mode: 'out-in',
   },
   data() {
+    console.log('component data()')
     const filter = tabToFilterMapping({ tab: 'post', id: this.$route.params.id })
     return {
       User: [],
@@ -461,8 +462,8 @@ export default {
       variables() {
         return {
           id: this.$route.params.id,
-          followedByCount: this.followedByCount || 7,
-          followingCount: this.followingCount || 7,
+          followedByCount: this.followedByCount, 
+          followingCount: this.followingCount
         }
       },
       fetchPolicy: 'cache-and-network',

From 72dfeb3983689737afbdafeda1ec1a5862da3754 Mon Sep 17 00:00:00 2001
From: Raphael Beer <raphael.beer@protonmail.com>
Date: Wed, 1 Apr 2020 11:15:47 +0200
Subject: [PATCH 34/54] Refactor: ds-text out

---
 .../features/FollowList/FollowList.vue        | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/webapp/components/features/FollowList/FollowList.vue b/webapp/components/features/FollowList/FollowList.vue
index d6b62856b..6199ad95c 100644
--- a/webapp/components/features/FollowList/FollowList.vue
+++ b/webapp/components/features/FollowList/FollowList.vue
@@ -1,23 +1,22 @@
 <template>
   <base-card class="follow-list">
     <template v-if="connections && connections.length">
-      <ds-text tag="h5" color="soft" class="spacer-x-small">
+      <h5 class="title spacer-x-small">
         {{ userName | truncate(15) }} {{ $t(`profile.network.${type}`) }}
-      </ds-text>
+      </h5>
       <div :class="connectionsClass">
         <user-teaser
           v-for="connection in filteredConnections"
-          :user="connection"
           :key="connection.id"
+          :user="connection"
           class="spacer-x-small"
         />
       </div>
       <base-button
         v-if="allConnectionsCount - connections.length"
         :loading="loading"
-        size="small"
-        color="softer"
         class="spacer-x-small"
+        size="small"
         @click="$emit('fetchAllConnections', type)"
       >
         {{
@@ -29,11 +28,11 @@
       <ds-input
         v-if="connections.length > 7"
         v-focus="true"
-        :placeholder="filter"
-        size="small"
-        icon="filter"
         :name="`${type}Filter`"
+        :placeholder="filter"
         class="spacer-x-small"
+        icon="filter"
+        size="small"
         @input.native="setFilter"
       />
     </template>
@@ -128,6 +127,11 @@ export default {
   //max-height: ($size-avatar-small + $space-x-small * 2) * 8;
   width: auto;
 
+  > .title {
+    color: $text-color-soft;
+    font-size: $font-size-small + 0.03rem;
+  }
+
   .connections.--overflow {
     height: ($size-avatar-base + $space-x-small * 2) * 5;
     margin-top: -$space-x-small;

From 5fad066819266c63906f105a47f50d462e71cef6 Mon Sep 17 00:00:00 2001
From: Raphael Beer <raphael.beer@protonmail.com>
Date: Thu, 2 Apr 2020 02:12:13 +0200
Subject: [PATCH 35/54] Change: `selectable: false` on LegacyEmbed schema

---
 webapp/components/Editor/nodes/LegacyEmbed.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/webapp/components/Editor/nodes/LegacyEmbed.js b/webapp/components/Editor/nodes/LegacyEmbed.js
index 9c583cf54..0d308a356 100644
--- a/webapp/components/Editor/nodes/LegacyEmbed.js
+++ b/webapp/components/Editor/nodes/LegacyEmbed.js
@@ -40,6 +40,7 @@ export default class Embed extends Node {
       },
       group: 'inline',
       inline: true,
+      selectable: false,
       parseDOM: [
         {
           tag: 'a[href].embed',

From db780762929975270f1993f5888bbe8abd128e16 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 9 Apr 2020 04:15:29 +0000
Subject: [PATCH 36/54] build(deps-dev): bump expect from 25.2.7 to 25.3.0

Bumps [expect](https://github.com/facebook/jest/tree/HEAD/packages/expect) from 25.2.7 to 25.3.0.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v25.3.0/packages/expect)

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

diff --git a/package.json b/package.json
index 7e2805f9f..452e9ab6d 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
     "cypress-plugin-retries": "^1.5.2",
     "date-fns": "^2.11.1",
     "dotenv": "^8.2.0",
-    "expect": "^25.2.7",
+    "expect": "^25.3.0",
     "faker": "Marak/faker.js#master",
     "graphql-request": "^1.8.2",
     "import": "^0.0.6",
diff --git a/yarn.lock b/yarn.lock
index f3abc343b..247f8bf99 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1082,10 +1082,10 @@
   dependencies:
     "@hapi/hoek" "8.x.x"
 
-"@jest/types@^25.2.6":
-  version "25.2.6"
-  resolved "https://registry.yarnpkg.com/@jest/types/-/types-25.2.6.tgz#c12f44af9bed444438091e4b59e7ed05f8659cb6"
-  integrity sha512-myJTTV37bxK7+3NgKc4Y/DlQ5q92/NOwZsZ+Uch7OXdElxOg61QYc72fPYNAjlvbnJ2YvbXLamIsa9tj48BmyQ==
+"@jest/types@^25.3.0":
+  version "25.3.0"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-25.3.0.tgz#88f94b277a1d028fd7117bc1f74451e0fc2131e7"
+  integrity sha512-UkaDNewdqXAmCDbN2GlUM6amDKS78eCqiw/UmF5nE0mmLTd6moJkiZJML/X52Ke3LH7Swhw883IRXq8o9nWjVw==
   dependencies:
     "@types/istanbul-lib-coverage" "^2.0.0"
     "@types/istanbul-reports" "^1.1.1"
@@ -3047,16 +3047,16 @@ expand-brackets@^2.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
-expect@^25.2.7:
-  version "25.2.7"
-  resolved "https://registry.yarnpkg.com/expect/-/expect-25.2.7.tgz#509b79f47502835f4071ff3ecc401f2eaecca709"
-  integrity sha512-yA+U2Ph0MkMsJ9N8q5hs9WgWI6oJYfecdXta6LkP/alY/jZZL1MHlJ2wbLh60Ucqf3G+51ytbqV3mlGfmxkpNw==
+expect@^25.3.0:
+  version "25.3.0"
+  resolved "https://registry.yarnpkg.com/expect/-/expect-25.3.0.tgz#5fd36e51befd05afb7184bc954f8a4792d184c71"
+  integrity sha512-buboTXML2h/L0Kh44Ys2Cx49mX20ISc5KDirkxIs3Q9AJv0kazweUAbukegr+nHDOvFRKmxdojjIHCjqAceYfg==
   dependencies:
-    "@jest/types" "^25.2.6"
+    "@jest/types" "^25.3.0"
     ansi-styles "^4.0.0"
     jest-get-type "^25.2.6"
-    jest-matcher-utils "^25.2.7"
-    jest-message-util "^25.2.6"
+    jest-matcher-utils "^25.3.0"
+    jest-message-util "^25.3.0"
     jest-regex-util "^25.2.6"
 
 extend-shallow@^2.0.1:
@@ -3993,38 +3993,38 @@ 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@^25.2.6:
-  version "25.2.6"
-  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-25.2.6.tgz#a6d70a9ab74507715ea1092ac513d1ab81c1b5e7"
-  integrity sha512-KuadXImtRghTFga+/adnNrv9s61HudRMR7gVSbP35UKZdn4IK2/0N0PpGZIqtmllK9aUyye54I3nu28OYSnqOg==
+jest-diff@^25.3.0:
+  version "25.3.0"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-25.3.0.tgz#0d7d6f5d6171e5dacde9e05be47b3615e147c26f"
+  integrity sha512-vyvs6RPoVdiwARwY4kqFWd4PirPLm2dmmkNzKqo38uZOzJvLee87yzDjIZLmY1SjM3XR5DwsUH+cdQ12vgqi1w==
   dependencies:
     chalk "^3.0.0"
     diff-sequences "^25.2.6"
     jest-get-type "^25.2.6"
-    pretty-format "^25.2.6"
+    pretty-format "^25.3.0"
 
 jest-get-type@^25.2.6:
   version "25.2.6"
   resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-25.2.6.tgz#0b0a32fab8908b44d508be81681487dbabb8d877"
   integrity sha512-DxjtyzOHjObRM+sM1knti6or+eOgcGU4xVSb2HNP1TqO4ahsT+rqZg+nyqHWJSvWgKC5cG3QjGFBqxLghiF/Ig==
 
-jest-matcher-utils@^25.2.7:
-  version "25.2.7"
-  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-25.2.7.tgz#53fad3c11fc42e92e374306df543026712c957a3"
-  integrity sha512-jNYmKQPRyPO3ny0KY1I4f0XW4XnpJ3Nx5ovT4ik0TYDOYzuXJW40axqOyS61l/voWbVT9y9nZ1THL1DlpaBVpA==
+jest-matcher-utils@^25.3.0:
+  version "25.3.0"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-25.3.0.tgz#76765788a26edaa8bc5f0100aea52ae383559648"
+  integrity sha512-ZBUJ2fchNIZt+fyzkuCFBb8SKaU//Rln45augfUtbHaGyVxCO++ANARdBK9oPGXU3hEDgyy7UHnOP/qNOJXFUg==
   dependencies:
     chalk "^3.0.0"
-    jest-diff "^25.2.6"
+    jest-diff "^25.3.0"
     jest-get-type "^25.2.6"
-    pretty-format "^25.2.6"
+    pretty-format "^25.3.0"
 
-jest-message-util@^25.2.6:
-  version "25.2.6"
-  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-25.2.6.tgz#9d5523bebec8cd9cdef75f0f3069d6ec9a2252df"
-  integrity sha512-Hgg5HbOssSqOuj+xU1mi7m3Ti2nwSQJQf/kxEkrz2r2rp2ZLO1pMeKkz2WiDUWgSR+APstqz0uMFcE5yc0qdcg==
+jest-message-util@^25.3.0:
+  version "25.3.0"
+  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-25.3.0.tgz#e3836826fe5ca538a337b87d9bd2648190867f85"
+  integrity sha512-5QNy9Id4WxJbRITEbA1T1kem9bk7y2fD0updZMSTNHtbEDnYOGLDPAuFBhFgVmOZpv0n6OMdVkK+WhyXEPCcOw==
   dependencies:
     "@babel/code-frame" "^7.0.0"
-    "@jest/types" "^25.2.6"
+    "@jest/types" "^25.3.0"
     "@types/stack-utils" "^1.0.1"
     chalk "^3.0.0"
     micromatch "^4.0.2"
@@ -5320,12 +5320,12 @@ pretty-bytes@5.3.0:
   resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.3.0.tgz#f2849e27db79fb4d6cfe24764fc4134f165989f2"
   integrity sha512-hjGrh+P926p4R4WbaB6OckyRtO0F0/lQBiT+0gnxjV+5kjPBrfVBFCsCLbMqVQeydvIoouYTCmmEURiH3R1Bdg==
 
-pretty-format@^25.2.6:
-  version "25.2.6"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-25.2.6.tgz#542a1c418d019bbf1cca2e3620443bc1323cb8d7"
-  integrity sha512-DEiWxLBaCHneffrIT4B+TpMvkV9RNvvJrd3lY9ew1CEQobDzEXmYT1mg0hJhljZty7kCc10z13ohOFAE8jrUDg==
+pretty-format@^25.3.0:
+  version "25.3.0"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-25.3.0.tgz#d0a4f988ff4a6cd350342fdabbb809aeb4d49ad5"
+  integrity sha512-wToHwF8bkQknIcFkBqNfKu4+UZqnrLn/Vr+wwKQwwvPzkBfDDKp/qIabFqdgtoi5PEnM8LFByVsOrHoa3SpTVA==
   dependencies:
-    "@jest/types" "^25.2.6"
+    "@jest/types" "^25.3.0"
     ansi-regex "^5.0.0"
     ansi-styles "^4.0.0"
     react-is "^16.12.0"

From 336599589b024e5d9b263c98a2439890379bed21 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 9 Apr 2020 04:16:32 +0000
Subject: [PATCH 37/54] build(deps-dev): bump jest from 25.2.7 to 25.3.0 in
 /backend

Bumps [jest](https://github.com/facebook/jest) from 25.2.7 to 25.3.0.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/compare/v25.2.7...v25.3.0)

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

diff --git a/backend/package.json b/backend/package.json
index 6e4a05c12..266d68c53 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -129,7 +129,7 @@
     "eslint-plugin-prettier": "~3.1.2",
     "eslint-plugin-promise": "~4.2.1",
     "eslint-plugin-standard": "~4.0.1",
-    "jest": "~25.2.7",
+    "jest": "~25.3.0",
     "nodemon": "~2.0.2",
     "prettier": "~2.0.2",
     "rosie": "^2.0.1",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 19e716fd5..ec2707cde 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -422,13 +422,27 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-bigint@^7.0.0":
+"@babel/plugin-syntax-async-generators@^7.8.4":
+  version "7.8.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d"
+  integrity sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-bigint@^7.0.0", "@babel/plugin-syntax-bigint@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz#4c9a6f669f5d0cdf1b90a1671e9a146be5300cea"
   integrity sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
+"@babel/plugin-syntax-class-properties@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.8.3.tgz#6cb933a8872c8d359bfde69bbeaae5162fd1e8f7"
+  integrity sha512-UcAyQWg2bAN647Q+O811tG9MrJ38Z10jjhQdKNAL8fsyPzE3cCN/uT+f55cFVY4aGO4jqJAvmqsuY3GQDwAoXg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+
 "@babel/plugin-syntax-dynamic-import@^7.8.0":
   version "7.8.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.0.tgz#3a6c1cd36af923db602df83c5aa72e08bb14353a"
@@ -443,6 +457,20 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
+"@babel/plugin-syntax-json-strings@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a"
+  integrity sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-logical-assignment-operators@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.8.3.tgz#3995d7d7ffff432f6ddc742b47e730c054599897"
+  integrity sha512-Zpg2Sgc++37kuFl6ppq2Q7Awc6E6AIW671x5PY8E/f7MCIyPPGK/EoeZXvvY3P42exZ3Q4/t3YOzP/HiN79jDg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+
 "@babel/plugin-syntax-nullish-coalescing-operator@^7.8.0":
   version "7.8.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.0.tgz#5d8f24ecffa4ae74164e53264953c5ea8ba6d149"
@@ -450,6 +478,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
+"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9"
+  integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
 "@babel/plugin-syntax-numeric-separator@^7.8.0", "@babel/plugin-syntax-numeric-separator@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.8.3.tgz#0e3fb63e09bea1b11e96467271c8308007e7c41f"
@@ -464,6 +499,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
+"@babel/plugin-syntax-object-rest-spread@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871"
+  integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
 "@babel/plugin-syntax-optional-catch-binding@^7.8.0":
   version "7.8.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.0.tgz#180c7bdd6b7fd81cc6d18269de12d5ddd60cabce"
@@ -471,6 +513,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
+"@babel/plugin-syntax-optional-catch-binding@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1"
+  integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
 "@babel/plugin-syntax-optional-chaining@^7.8.0":
   version "7.8.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.0.tgz#c40f4d4d6a4f5e71d2bfd949b0a7f1e1e6792fe0"
@@ -478,6 +527,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
+"@babel/plugin-syntax-optional-chaining@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a"
+  integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
 "@babel/plugin-syntax-throw-expressions@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-throw-expressions/-/plugin-syntax-throw-expressions-7.8.3.tgz#c763bcf26d202ddb65f1299a29d63aad312adb54"
@@ -1008,43 +1064,43 @@
   resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd"
   integrity sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw==
 
-"@jest/console@^25.2.6":
-  version "25.2.6"
-  resolved "https://registry.yarnpkg.com/@jest/console/-/console-25.2.6.tgz#f594847ec8aef3cf27f448abe97e76e491212e97"
-  integrity sha512-bGp+0PicZVCEhb+ifnW9wpKWONNdkhtJsRE7ap729hiAfTvCN6VhGx0s/l/V/skA2pnyqq+N/7xl9ZWfykDpsg==
+"@jest/console@^25.3.0":
+  version "25.3.0"
+  resolved "https://registry.yarnpkg.com/@jest/console/-/console-25.3.0.tgz#33b56b81238427bf3ebe3f7b3378d2f79cdbd409"
+  integrity sha512-LvSDNqpmZIZyweFaEQ6wKY7CbexPitlsLHGJtcooNECo0An/w49rFhjCJzu6efeb6+a3ee946xss1Jcd9r03UQ==
   dependencies:
     "@jest/source-map" "^25.2.6"
     chalk "^3.0.0"
-    jest-util "^25.2.6"
+    jest-util "^25.3.0"
     slash "^3.0.0"
 
-"@jest/core@^25.2.7":
-  version "25.2.7"
-  resolved "https://registry.yarnpkg.com/@jest/core/-/core-25.2.7.tgz#58d697687e94ee644273d15e4eed6a20e27187cd"
-  integrity sha512-Nd6ELJyR+j0zlwhzkfzY70m04hAur0VnMwJXVe4VmmD/SaQ6DEyal++ERQ1sgyKIKKEqRuui6k/R0wHLez4P+g==
+"@jest/core@^25.3.0":
+  version "25.3.0"
+  resolved "https://registry.yarnpkg.com/@jest/core/-/core-25.3.0.tgz#80f97a7a8b59dde741a24f30871cc26d0197d426"
+  integrity sha512-+D5a/tFf6pA/Gqft2DLBp/yeSRgXhlJ+Wpst0X/ZkfTRP54qDR3C61VfHwaex+GzZBiTcE9vQeoZ2v5T10+Mqw==
   dependencies:
-    "@jest/console" "^25.2.6"
-    "@jest/reporters" "^25.2.6"
-    "@jest/test-result" "^25.2.6"
-    "@jest/transform" "^25.2.6"
-    "@jest/types" "^25.2.6"
+    "@jest/console" "^25.3.0"
+    "@jest/reporters" "^25.3.0"
+    "@jest/test-result" "^25.3.0"
+    "@jest/transform" "^25.3.0"
+    "@jest/types" "^25.3.0"
     ansi-escapes "^4.2.1"
     chalk "^3.0.0"
     exit "^0.1.2"
     graceful-fs "^4.2.3"
-    jest-changed-files "^25.2.6"
-    jest-config "^25.2.7"
-    jest-haste-map "^25.2.6"
-    jest-message-util "^25.2.6"
+    jest-changed-files "^25.3.0"
+    jest-config "^25.3.0"
+    jest-haste-map "^25.3.0"
+    jest-message-util "^25.3.0"
     jest-regex-util "^25.2.6"
-    jest-resolve "^25.2.6"
-    jest-resolve-dependencies "^25.2.7"
-    jest-runner "^25.2.7"
-    jest-runtime "^25.2.7"
-    jest-snapshot "^25.2.7"
-    jest-util "^25.2.6"
-    jest-validate "^25.2.6"
-    jest-watcher "^25.2.7"
+    jest-resolve "^25.3.0"
+    jest-resolve-dependencies "^25.3.0"
+    jest-runner "^25.3.0"
+    jest-runtime "^25.3.0"
+    jest-snapshot "^25.3.0"
+    jest-util "^25.3.0"
+    jest-validate "^25.3.0"
+    jest-watcher "^25.3.0"
     micromatch "^4.0.2"
     p-each-series "^2.1.0"
     realpath-native "^2.0.0"
@@ -1052,36 +1108,36 @@
     slash "^3.0.0"
     strip-ansi "^6.0.0"
 
-"@jest/environment@^25.2.6":
-  version "25.2.6"
-  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-25.2.6.tgz#8f7931e79abd81893ce88b7306f0cc4744835000"
-  integrity sha512-17WIw+wCb9drRNFw1hi8CHah38dXVdOk7ga9exThhGtXlZ9mK8xH4DjSB9uGDGXIWYSHmrxoyS6KJ7ywGr7bzg==
+"@jest/environment@^25.3.0":
+  version "25.3.0"
+  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-25.3.0.tgz#587f28ddb4b0dfe97404d3d4a4c9dbfa0245fb2e"
+  integrity sha512-vgooqwJTHLLak4fE+TaCGeYP7Tz1Y3CKOsNxR1sE0V3nx3KRUHn3NUnt+wbcfd5yQWKZQKAfW6wqbuwQLrXo3g==
   dependencies:
-    "@jest/fake-timers" "^25.2.6"
-    "@jest/types" "^25.2.6"
-    jest-mock "^25.2.6"
+    "@jest/fake-timers" "^25.3.0"
+    "@jest/types" "^25.3.0"
+    jest-mock "^25.3.0"
 
-"@jest/fake-timers@^25.2.6":
-  version "25.2.6"
-  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-25.2.6.tgz#239dbde3f56badf7d05bcf888f5d669296077cad"
-  integrity sha512-A6qtDIA2zg/hVgUJJYzQSHFBIp25vHdSxW/s4XmTJAYxER6eL0NQdQhe4+232uUSviKitubHGXXirt5M7blPiA==
+"@jest/fake-timers@^25.3.0":
+  version "25.3.0"
+  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-25.3.0.tgz#995aad36d5c8984165ca5db12e740ab8dbf7042a"
+  integrity sha512-NHAj7WbsyR3qBJPpBwSwqaq2WluIvUQsyzpJTN7XDVk7VnlC/y1BAnaYZL3vbPIP8Nhm0Ae5DJe0KExr/SdMJQ==
   dependencies:
-    "@jest/types" "^25.2.6"
-    jest-message-util "^25.2.6"
-    jest-mock "^25.2.6"
-    jest-util "^25.2.6"
+    "@jest/types" "^25.3.0"
+    jest-message-util "^25.3.0"
+    jest-mock "^25.3.0"
+    jest-util "^25.3.0"
     lolex "^5.0.0"
 
-"@jest/reporters@^25.2.6":
-  version "25.2.6"
-  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-25.2.6.tgz#6d87e40fb15adb69e22bb83aa02a4d88b2253b5f"
-  integrity sha512-DRMyjaxcd6ZKctiXNcuVObnPwB1eUs7xrUVu0J2V0p5/aZJei5UM9GL3s/bmN4hRV8Mt3zXh+/9X2o0Q4ClZIA==
+"@jest/reporters@^25.3.0":
+  version "25.3.0"
+  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-25.3.0.tgz#7f39f0e6911561cc5112a1b54656de18faee269b"
+  integrity sha512-1u0ZBygs0C9DhdYgLCrRfZfNKQa+9+J7Uo+Z9z0RWLHzgsxhoG32lrmMOtUw48yR6bLNELdvzormwUqSk4H4Vg==
   dependencies:
     "@bcoe/v8-coverage" "^0.2.3"
-    "@jest/console" "^25.2.6"
-    "@jest/test-result" "^25.2.6"
-    "@jest/transform" "^25.2.6"
-    "@jest/types" "^25.2.6"
+    "@jest/console" "^25.3.0"
+    "@jest/test-result" "^25.3.0"
+    "@jest/transform" "^25.3.0"
+    "@jest/types" "^25.3.0"
     chalk "^3.0.0"
     collect-v8-coverage "^1.0.0"
     exit "^0.1.2"
@@ -1090,10 +1146,10 @@
     istanbul-lib-instrument "^4.0.0"
     istanbul-lib-report "^3.0.0"
     istanbul-lib-source-maps "^4.0.0"
-    istanbul-reports "^3.0.0"
-    jest-haste-map "^25.2.6"
-    jest-resolve "^25.2.6"
-    jest-util "^25.2.6"
+    istanbul-reports "^3.0.2"
+    jest-haste-map "^25.3.0"
+    jest-resolve "^25.3.0"
+    jest-util "^25.3.0"
     jest-worker "^25.2.6"
     slash "^3.0.0"
     source-map "^0.6.0"
@@ -1112,25 +1168,25 @@
     graceful-fs "^4.2.3"
     source-map "^0.6.0"
 
-"@jest/test-result@^25.2.6":
-  version "25.2.6"
-  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-25.2.6.tgz#f6082954955313eb96f6cabf9fb14f8017826916"
-  integrity sha512-gmGgcF4qz/pkBzyfJuVHo2DA24kIgVQ5Pf/VpW4QbyMLSegi8z+9foSZABfIt5se6k0fFj/3p/vrQXdaOgit0w==
+"@jest/test-result@^25.3.0":
+  version "25.3.0"
+  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-25.3.0.tgz#137fab5e5c6fed36e5d40735d1eb029325e3bf06"
+  integrity sha512-mqrGuiiPXl1ap09Mydg4O782F3ouDQfsKqtQzIjitpwv3t1cHDwCto21jThw6WRRE+dKcWQvLG70GpyLJICfGw==
   dependencies:
-    "@jest/console" "^25.2.6"
-    "@jest/types" "^25.2.6"
+    "@jest/console" "^25.3.0"
+    "@jest/types" "^25.3.0"
     "@types/istanbul-lib-coverage" "^2.0.0"
     collect-v8-coverage "^1.0.0"
 
-"@jest/test-sequencer@^25.2.7":
-  version "25.2.7"
-  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-25.2.7.tgz#e4331f7b4850e34289b9a5c8ec8a2c03b400da8f"
-  integrity sha512-s2uYGOXONDSTJQcZJ9A3Zkg3hwe53RlX1HjUNqjUy3HIqwgwCKJbnAKYsORPbhxXi3ARMKA7JNBi9arsTxXoYw==
+"@jest/test-sequencer@^25.3.0":
+  version "25.3.0"
+  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-25.3.0.tgz#271ad5f2b8f8137d092ccedc87e16a50f8676209"
+  integrity sha512-Xvns3xbji7JCvVcDGvqJ/pf4IpmohPODumoPEZJ0/VgC5gI4XaNVIBET2Dq5Czu6Gk3xFcmhtthh/MBOTljdNg==
   dependencies:
-    "@jest/test-result" "^25.2.6"
-    jest-haste-map "^25.2.6"
-    jest-runner "^25.2.7"
-    jest-runtime "^25.2.7"
+    "@jest/test-result" "^25.3.0"
+    jest-haste-map "^25.3.0"
+    jest-runner "^25.3.0"
+    jest-runtime "^25.3.0"
 
 "@jest/transform@^25.2.6":
   version "25.2.6"
@@ -1154,6 +1210,28 @@
     source-map "^0.6.1"
     write-file-atomic "^3.0.0"
 
+"@jest/transform@^25.3.0":
+  version "25.3.0"
+  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-25.3.0.tgz#083c5447d5307d9b9494d6968115b647460e71f1"
+  integrity sha512-W01p8kTDvvEX6kd0tJc7Y5VdYyFaKwNWy1HQz6Jqlhu48z/8Gxp+yFCDVj+H8Rc7ezl3Mg0hDaGuFVkmHOqirg==
+  dependencies:
+    "@babel/core" "^7.1.0"
+    "@jest/types" "^25.3.0"
+    babel-plugin-istanbul "^6.0.0"
+    chalk "^3.0.0"
+    convert-source-map "^1.4.0"
+    fast-json-stable-stringify "^2.0.0"
+    graceful-fs "^4.2.3"
+    jest-haste-map "^25.3.0"
+    jest-regex-util "^25.2.6"
+    jest-util "^25.3.0"
+    micromatch "^4.0.2"
+    pirates "^4.0.1"
+    realpath-native "^2.0.0"
+    slash "^3.0.0"
+    source-map "^0.6.1"
+    write-file-atomic "^3.0.0"
+
 "@jest/types@^25.2.6":
   version "25.2.6"
   resolved "https://registry.yarnpkg.com/@jest/types/-/types-25.2.6.tgz#c12f44af9bed444438091e4b59e7ed05f8659cb6"
@@ -1164,6 +1242,16 @@
     "@types/yargs" "^15.0.0"
     chalk "^3.0.0"
 
+"@jest/types@^25.3.0":
+  version "25.3.0"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-25.3.0.tgz#88f94b277a1d028fd7117bc1f74451e0fc2131e7"
+  integrity sha512-UkaDNewdqXAmCDbN2GlUM6amDKS78eCqiw/UmF5nE0mmLTd6moJkiZJML/X52Ke3LH7Swhw883IRXq8o9nWjVw==
+  dependencies:
+    "@types/istanbul-lib-coverage" "^2.0.0"
+    "@types/istanbul-reports" "^1.1.1"
+    "@types/yargs" "^15.0.0"
+    chalk "^3.0.0"
+
 "@metascraper/helpers@^4.10.2":
   version "4.10.2"
   resolved "https://registry.yarnpkg.com/@metascraper/helpers/-/helpers-4.10.2.tgz#864e49c71468548441f3a1ab68fdb2913855821b"
@@ -1403,6 +1491,17 @@
     "@types/babel__template" "*"
     "@types/babel__traverse" "*"
 
+"@types/babel__core@^7.1.7":
+  version "7.1.7"
+  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.7.tgz#1dacad8840364a57c98d0dd4855c6dd3752c6b89"
+  integrity sha512-RL62NqSFPCDK2FM1pSDH0scHpJvsXtZNiYlMB73DgPBaG1E38ZYVL+ei5EkWRbr+KC4YNiAUNBnRj+bgwpgjMw==
+  dependencies:
+    "@babel/parser" "^7.1.0"
+    "@babel/types" "^7.0.0"
+    "@types/babel__generator" "*"
+    "@types/babel__template" "*"
+    "@types/babel__traverse" "*"
+
 "@types/babel__generator@*":
   version "7.0.2"
   resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.0.2.tgz#d2112a6b21fad600d7674274293c85dce0cb47fc"
@@ -2290,7 +2389,20 @@ babel-eslint@~10.1.0:
     eslint-visitor-keys "^1.0.0"
     resolve "^1.12.0"
 
-babel-jest@^25.2.6, babel-jest@~25.2.6:
+babel-jest@^25.3.0:
+  version "25.3.0"
+  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-25.3.0.tgz#999d0c19e8427f66b796bf9ea233eedf087b957c"
+  integrity sha512-qiXeX1Cmw4JZ5yQ4H57WpkO0MZ61Qj+YnsVUwAMnDV5ls+yHon11XjarDdgP7H8lTmiEi6biiZA8y3Tmvx6pCg==
+  dependencies:
+    "@jest/transform" "^25.3.0"
+    "@jest/types" "^25.3.0"
+    "@types/babel__core" "^7.1.7"
+    babel-plugin-istanbul "^6.0.0"
+    babel-preset-jest "^25.3.0"
+    chalk "^3.0.0"
+    slash "^3.0.0"
+
+babel-jest@~25.2.6:
   version "25.2.6"
   resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-25.2.6.tgz#fe67ff4d0db3626ca8082da8881dd5e84e07ae75"
   integrity sha512-MDJOAlwtIeIQiGshyX0d2PxTbV73xZMpNji40ivVTPQOm59OdRR9nYCkffqI7ugtsK4JR98HgNKbDbuVf4k5QQ==
@@ -2335,6 +2447,22 @@ babel-plugin-transform-runtime@^6.23.0:
   dependencies:
     babel-runtime "^6.22.0"
 
+babel-preset-current-node-syntax@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-0.1.2.tgz#fb4a4c51fe38ca60fede1dc74ab35eb843cb41d6"
+  integrity sha512-u/8cS+dEiK1SFILbOC8/rUI3ml9lboKuuMvZ/4aQnQmhecQAgPw5ew066C1ObnEAUmlx7dv/s2z52psWEtLNiw==
+  dependencies:
+    "@babel/plugin-syntax-async-generators" "^7.8.4"
+    "@babel/plugin-syntax-bigint" "^7.8.3"
+    "@babel/plugin-syntax-class-properties" "^7.8.3"
+    "@babel/plugin-syntax-json-strings" "^7.8.3"
+    "@babel/plugin-syntax-logical-assignment-operators" "^7.8.3"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
+    "@babel/plugin-syntax-numeric-separator" "^7.8.3"
+    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
+    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
+
 babel-preset-jest@^25.2.6:
   version "25.2.6"
   resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-25.2.6.tgz#5d3f7c99e2a8508d61775c9d68506d143b7f71b5"
@@ -2344,6 +2472,14 @@ babel-preset-jest@^25.2.6:
     "@babel/plugin-syntax-object-rest-spread" "^7.0.0"
     babel-plugin-jest-hoist "^25.2.6"
 
+babel-preset-jest@^25.3.0:
+  version "25.3.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-25.3.0.tgz#9ab40aee52a19bdc52b8b1ec2403d5914ac3d86b"
+  integrity sha512-tjdvLKNMwDI9r+QWz9sZUQGTq1dpoxjUqFUpEasAc7MOtHg9XuLT2fx0udFG+k1nvMV0WvHHVAN7VmCZ+1Zxbw==
+  dependencies:
+    babel-plugin-jest-hoist "^25.2.6"
+    babel-preset-current-node-syntax "^0.1.2"
+
 babel-runtime@^6.22.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
@@ -3974,16 +4110,16 @@ expect-ct@0.2.0:
   resolved "https://registry.yarnpkg.com/expect-ct/-/expect-ct-0.2.0.tgz#3a54741b6ed34cc7a93305c605f63cd268a54a62"
   integrity sha512-6SK3MG/Bbhm8MsgyJAylg+ucIOU71/FzyFalcfu5nY19dH8y/z0tBJU0wrNBXD4B27EoQtqPF/9wqH0iYAd04g==
 
-expect@^25.2.7:
-  version "25.2.7"
-  resolved "https://registry.yarnpkg.com/expect/-/expect-25.2.7.tgz#509b79f47502835f4071ff3ecc401f2eaecca709"
-  integrity sha512-yA+U2Ph0MkMsJ9N8q5hs9WgWI6oJYfecdXta6LkP/alY/jZZL1MHlJ2wbLh60Ucqf3G+51ytbqV3mlGfmxkpNw==
+expect@^25.3.0:
+  version "25.3.0"
+  resolved "https://registry.yarnpkg.com/expect/-/expect-25.3.0.tgz#5fd36e51befd05afb7184bc954f8a4792d184c71"
+  integrity sha512-buboTXML2h/L0Kh44Ys2Cx49mX20ISc5KDirkxIs3Q9AJv0kazweUAbukegr+nHDOvFRKmxdojjIHCjqAceYfg==
   dependencies:
-    "@jest/types" "^25.2.6"
+    "@jest/types" "^25.3.0"
     ansi-styles "^4.0.0"
     jest-get-type "^25.2.6"
-    jest-matcher-utils "^25.2.7"
-    jest-message-util "^25.2.6"
+    jest-matcher-utils "^25.3.0"
+    jest-message-util "^25.3.0"
     jest-regex-util "^25.2.6"
 
 express@^4.0.0, express@^4.17.1:
@@ -5479,10 +5615,10 @@ istanbul-lib-source-maps@^4.0.0:
     istanbul-lib-coverage "^3.0.0"
     source-map "^0.6.1"
 
-istanbul-reports@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.0.0.tgz#d4d16d035db99581b6194e119bbf36c963c5eb70"
-  integrity sha512-2osTcC8zcOSUkImzN2EWQta3Vdi4WjjKw99P2yWx5mLnigAM0Rd5uYFn1cf2i/Ois45GkNjaoTqc5CxgMSX80A==
+istanbul-reports@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.0.2.tgz#d593210e5000683750cb09fc0644e4b6e27fd53b"
+  integrity sha512-9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw==
   dependencies:
     html-escaper "^2.0.0"
     istanbul-lib-report "^3.0.0"
@@ -5492,108 +5628,108 @@ iterall@^1.1.3, iterall@^1.2.1, iterall@^1.2.2, iterall@^1.3.0:
   resolved "https://registry.yarnpkg.com/iterall/-/iterall-1.3.0.tgz#afcb08492e2915cbd8a0884eb93a8c94d0d72fea"
   integrity sha512-QZ9qOMdF+QLHxy1QIpUHUU1D5pS2CG2P69LF6L6CPjPYA/XMOmKV3PZpawHoAjHNyB0swdVTRxdYT4tbBbxqwg==
 
-jest-changed-files@^25.2.6:
-  version "25.2.6"
-  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-25.2.6.tgz#7d569cd6b265b1a84db3914db345d9c452f26b71"
-  integrity sha512-F7l2m5n55jFnJj4ItB9XbAlgO+6umgvz/mdK76BfTd2NGkvGf9x96hUXP/15a1K0k14QtVOoutwpRKl360msvg==
+jest-changed-files@^25.3.0:
+  version "25.3.0"
+  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-25.3.0.tgz#85d8de6f4bd13dafda9d7f1e3f2565fc0e183c78"
+  integrity sha512-eqd5hyLbUjIVvLlJ3vQ/MoPxsxfESVXG9gvU19XXjKzxr+dXmZIqCXiY0OiYaibwlHZBJl2Vebkc0ADEMzCXew==
   dependencies:
-    "@jest/types" "^25.2.6"
+    "@jest/types" "^25.3.0"
     execa "^3.2.0"
     throat "^5.0.0"
 
-jest-cli@^25.2.7:
-  version "25.2.7"
-  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-25.2.7.tgz#515b61fee402c397ffa8d570532f7b039c3159f4"
-  integrity sha512-OOAZwY4Jkd3r5WhVM5L3JeLNFaylvHUczMLxQDVLrrVyb1Cy+DNJ6MVsb5TLh6iBklB42m5TOP+IbOgKGGOtMw==
+jest-cli@^25.3.0:
+  version "25.3.0"
+  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-25.3.0.tgz#d9e11f5700cc5946583cf0d01a9bdebceed448d2"
+  integrity sha512-XpNQPlW1tzpP7RGG8dxpkRegYDuLjzSiENu92+CYM87nEbmEPb3b4+yo8xcsHOnj0AG7DUt9b3uG8LuHI3MDzw==
   dependencies:
-    "@jest/core" "^25.2.7"
-    "@jest/test-result" "^25.2.6"
-    "@jest/types" "^25.2.6"
+    "@jest/core" "^25.3.0"
+    "@jest/test-result" "^25.3.0"
+    "@jest/types" "^25.3.0"
     chalk "^3.0.0"
     exit "^0.1.2"
     import-local "^3.0.2"
     is-ci "^2.0.0"
-    jest-config "^25.2.7"
-    jest-util "^25.2.6"
-    jest-validate "^25.2.6"
+    jest-config "^25.3.0"
+    jest-util "^25.3.0"
+    jest-validate "^25.3.0"
     prompts "^2.0.1"
     realpath-native "^2.0.0"
     yargs "^15.3.1"
 
-jest-config@^25.2.7:
-  version "25.2.7"
-  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-25.2.7.tgz#a14e5b96575987ce913dd9fc20ac8cd4b35a8c29"
-  integrity sha512-rIdPPXR6XUxi+7xO4CbmXXkE6YWprvlKc4kg1SrkCL2YV5m/8MkHstq9gBZJ19Qoa3iz/GP+0sTG/PcIwkFojg==
+jest-config@^25.3.0:
+  version "25.3.0"
+  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-25.3.0.tgz#112b5e2f2e57dec4501dd2fe979044c06fb1317e"
+  integrity sha512-CmF1JnNWFmoCSPC4tnU52wnVBpuxHjilA40qH/03IHxIevkjUInSMwaDeE6ACfxMPTLidBGBCO3EbxvzPbo8wA==
   dependencies:
     "@babel/core" "^7.1.0"
-    "@jest/test-sequencer" "^25.2.7"
-    "@jest/types" "^25.2.6"
-    babel-jest "^25.2.6"
+    "@jest/test-sequencer" "^25.3.0"
+    "@jest/types" "^25.3.0"
+    babel-jest "^25.3.0"
     chalk "^3.0.0"
     deepmerge "^4.2.2"
     glob "^7.1.1"
-    jest-environment-jsdom "^25.2.6"
-    jest-environment-node "^25.2.6"
+    jest-environment-jsdom "^25.3.0"
+    jest-environment-node "^25.3.0"
     jest-get-type "^25.2.6"
-    jest-jasmine2 "^25.2.7"
+    jest-jasmine2 "^25.3.0"
     jest-regex-util "^25.2.6"
-    jest-resolve "^25.2.6"
-    jest-util "^25.2.6"
-    jest-validate "^25.2.6"
+    jest-resolve "^25.3.0"
+    jest-util "^25.3.0"
+    jest-validate "^25.3.0"
     micromatch "^4.0.2"
-    pretty-format "^25.2.6"
+    pretty-format "^25.3.0"
     realpath-native "^2.0.0"
 
-jest-diff@^25.2.6:
-  version "25.2.6"
-  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-25.2.6.tgz#a6d70a9ab74507715ea1092ac513d1ab81c1b5e7"
-  integrity sha512-KuadXImtRghTFga+/adnNrv9s61HudRMR7gVSbP35UKZdn4IK2/0N0PpGZIqtmllK9aUyye54I3nu28OYSnqOg==
+jest-diff@^25.3.0:
+  version "25.3.0"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-25.3.0.tgz#0d7d6f5d6171e5dacde9e05be47b3615e147c26f"
+  integrity sha512-vyvs6RPoVdiwARwY4kqFWd4PirPLm2dmmkNzKqo38uZOzJvLee87yzDjIZLmY1SjM3XR5DwsUH+cdQ12vgqi1w==
   dependencies:
     chalk "^3.0.0"
     diff-sequences "^25.2.6"
     jest-get-type "^25.2.6"
-    pretty-format "^25.2.6"
+    pretty-format "^25.3.0"
 
-jest-docblock@^25.2.6:
-  version "25.2.6"
-  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-25.2.6.tgz#4b09f1e7b7d6b3f39242ef3647ac7106770f722b"
-  integrity sha512-VAYrljEq0upq0oERfIaaNf28gC6p9gORndhHstCYF8NWGNQJnzoaU//S475IxfWMk4UjjVmS9rJKLe5Jjjbixw==
+jest-docblock@^25.3.0:
+  version "25.3.0"
+  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-25.3.0.tgz#8b777a27e3477cd77a168c05290c471a575623ef"
+  integrity sha512-aktF0kCar8+zxRHxQZwxMy70stc9R1mOmrLsT5VO3pIT0uzGRSDAXxSlz4NqQWpuLjPpuMhPRl7H+5FRsvIQAg==
   dependencies:
     detect-newline "^3.0.0"
 
-jest-each@^25.2.6:
-  version "25.2.6"
-  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-25.2.6.tgz#026f6dea2ccc443c35cea793265620aab1b278b6"
-  integrity sha512-OgQ01VINaRD6idWJOhCYwUc5EcgHBiFlJuw+ON2VgYr7HLtMFyCcuo+3mmBvuLUH4QudREZN7cDCZviknzsaJQ==
+jest-each@^25.3.0:
+  version "25.3.0"
+  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-25.3.0.tgz#a319eecf1f6076164ab86f99ca166a55b96c0bd4"
+  integrity sha512-aBfS4VOf/Qs95yUlX6d6WBv0szvOcTkTTyCIaLuQGj4bSHsT+Wd9dDngVHrCe5uytxpN8VM+NAloI6nbPjXfXw==
   dependencies:
-    "@jest/types" "^25.2.6"
+    "@jest/types" "^25.3.0"
     chalk "^3.0.0"
     jest-get-type "^25.2.6"
-    jest-util "^25.2.6"
-    pretty-format "^25.2.6"
+    jest-util "^25.3.0"
+    pretty-format "^25.3.0"
 
-jest-environment-jsdom@^25.2.6:
-  version "25.2.6"
-  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-25.2.6.tgz#b7ae41c6035905b8e58d63a8f63cf8eaa00af279"
-  integrity sha512-/o7MZIhGmLGIEG5j7r5B5Az0umWLCHU+F5crwfbm0BzC4ybHTJZOQTFQWhohBg+kbTCNOuftMcqHlVkVduJCQQ==
+jest-environment-jsdom@^25.3.0:
+  version "25.3.0"
+  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-25.3.0.tgz#c493ab8c41f28001520c70ef67dd88b88be6af05"
+  integrity sha512-jdE4bQN+k2QEZ9sWOxsqDJvMzbdFSCN/4tw8X0TQaCqyzKz58PyEf41oIr4WO7ERdp7WaJGBSUKF7imR3UW1lg==
   dependencies:
-    "@jest/environment" "^25.2.6"
-    "@jest/fake-timers" "^25.2.6"
-    "@jest/types" "^25.2.6"
-    jest-mock "^25.2.6"
-    jest-util "^25.2.6"
+    "@jest/environment" "^25.3.0"
+    "@jest/fake-timers" "^25.3.0"
+    "@jest/types" "^25.3.0"
+    jest-mock "^25.3.0"
+    jest-util "^25.3.0"
     jsdom "^15.2.1"
 
-jest-environment-node@^25.2.6:
-  version "25.2.6"
-  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-25.2.6.tgz#ad4398432867113f474d94fe37b071ed04b30f3d"
-  integrity sha512-D1Ihj14fxZiMHGeTtU/LunhzSI+UeBvlr/rcXMTNyRMUMSz2PEhuqGbB78brBY6Dk3FhJDk7Ta+8reVaGjLWhA==
+jest-environment-node@^25.3.0:
+  version "25.3.0"
+  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-25.3.0.tgz#9845f0e63991e8498448cb0ae804935689533db9"
+  integrity sha512-XO09S29Nx1NU7TiMPHMoDIkxoGBuKSTbE+sHp0gXbeLDXhIdhysUI25kOqFFSD9AuDgvPvxWCXrvNqiFsOH33g==
   dependencies:
-    "@jest/environment" "^25.2.6"
-    "@jest/fake-timers" "^25.2.6"
-    "@jest/types" "^25.2.6"
-    jest-mock "^25.2.6"
-    jest-util "^25.2.6"
+    "@jest/environment" "^25.3.0"
+    "@jest/fake-timers" "^25.3.0"
+    "@jest/types" "^25.3.0"
+    jest-mock "^25.3.0"
+    jest-util "^25.3.0"
     semver "^6.3.0"
 
 jest-get-type@^25.2.6:
@@ -5620,66 +5756,85 @@ jest-haste-map@^25.2.6:
   optionalDependencies:
     fsevents "^2.1.2"
 
-jest-jasmine2@^25.2.7:
-  version "25.2.7"
-  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-25.2.7.tgz#55ff87f8f462ef0e2f16fd19430b8be8bcebef0e"
-  integrity sha512-HeQxEbonp8fUvik9jF0lkU9ab1u5TQdIb7YSU9Fj7SxWtqHNDGyCpF6ZZ3r/5yuertxi+R95Ba9eA91GMQ38eA==
+jest-haste-map@^25.3.0:
+  version "25.3.0"
+  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-25.3.0.tgz#b7683031c9c9ddc0521d311564108b244b11e4c6"
+  integrity sha512-LjXaRa+F8wwtSxo9G+hHD/Cp63PPQzvaBL9XCVoJD2rrcJO0Zr2+YYzAFWWYJ5GlPUkoaJFJtOuk0sL6MJY80A==
+  dependencies:
+    "@jest/types" "^25.3.0"
+    anymatch "^3.0.3"
+    fb-watchman "^2.0.0"
+    graceful-fs "^4.2.3"
+    jest-serializer "^25.2.6"
+    jest-util "^25.3.0"
+    jest-worker "^25.2.6"
+    micromatch "^4.0.2"
+    sane "^4.0.3"
+    walker "^1.0.7"
+    which "^2.0.2"
+  optionalDependencies:
+    fsevents "^2.1.2"
+
+jest-jasmine2@^25.3.0:
+  version "25.3.0"
+  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-25.3.0.tgz#16ae4f68adef65fb45001b26c864bcbcbf972830"
+  integrity sha512-NCYOGE6+HNzYFSui52SefgpsnIzvxjn6KAgqw66BdRp37xpMD/4kujDHLNW5bS5i53os5TcMn6jYrzQRO8VPrQ==
   dependencies:
     "@babel/traverse" "^7.1.0"
-    "@jest/environment" "^25.2.6"
+    "@jest/environment" "^25.3.0"
     "@jest/source-map" "^25.2.6"
-    "@jest/test-result" "^25.2.6"
-    "@jest/types" "^25.2.6"
+    "@jest/test-result" "^25.3.0"
+    "@jest/types" "^25.3.0"
     chalk "^3.0.0"
     co "^4.6.0"
-    expect "^25.2.7"
+    expect "^25.3.0"
     is-generator-fn "^2.0.0"
-    jest-each "^25.2.6"
-    jest-matcher-utils "^25.2.7"
-    jest-message-util "^25.2.6"
-    jest-runtime "^25.2.7"
-    jest-snapshot "^25.2.7"
-    jest-util "^25.2.6"
-    pretty-format "^25.2.6"
+    jest-each "^25.3.0"
+    jest-matcher-utils "^25.3.0"
+    jest-message-util "^25.3.0"
+    jest-runtime "^25.3.0"
+    jest-snapshot "^25.3.0"
+    jest-util "^25.3.0"
+    pretty-format "^25.3.0"
     throat "^5.0.0"
 
-jest-leak-detector@^25.2.6:
-  version "25.2.6"
-  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-25.2.6.tgz#68fbaf651142292b03e30641f33e15af9b8c62b1"
-  integrity sha512-n+aJUM+j/x1kIaPVxzerMqhAUuqTU1PL5kup46rXh+l9SP8H6LqECT/qD1GrnylE1L463/0StSPkH4fUpkuEjA==
+jest-leak-detector@^25.3.0:
+  version "25.3.0"
+  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-25.3.0.tgz#5b6bf04903b35be56038915a55f47291771f769f"
+  integrity sha512-jk7k24dMIfk8LUSQQGN8PyOy9+J0NAfHZWiDmUDYVMctY8FLJQ1eQ8+PjMoN8PgwhLIggUqgYJnyRFvUz3jLRw==
   dependencies:
     jest-get-type "^25.2.6"
-    pretty-format "^25.2.6"
+    pretty-format "^25.3.0"
 
-jest-matcher-utils@^25.2.7:
-  version "25.2.7"
-  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-25.2.7.tgz#53fad3c11fc42e92e374306df543026712c957a3"
-  integrity sha512-jNYmKQPRyPO3ny0KY1I4f0XW4XnpJ3Nx5ovT4ik0TYDOYzuXJW40axqOyS61l/voWbVT9y9nZ1THL1DlpaBVpA==
+jest-matcher-utils@^25.3.0:
+  version "25.3.0"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-25.3.0.tgz#76765788a26edaa8bc5f0100aea52ae383559648"
+  integrity sha512-ZBUJ2fchNIZt+fyzkuCFBb8SKaU//Rln45augfUtbHaGyVxCO++ANARdBK9oPGXU3hEDgyy7UHnOP/qNOJXFUg==
   dependencies:
     chalk "^3.0.0"
-    jest-diff "^25.2.6"
+    jest-diff "^25.3.0"
     jest-get-type "^25.2.6"
-    pretty-format "^25.2.6"
+    pretty-format "^25.3.0"
 
-jest-message-util@^25.2.6:
-  version "25.2.6"
-  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-25.2.6.tgz#9d5523bebec8cd9cdef75f0f3069d6ec9a2252df"
-  integrity sha512-Hgg5HbOssSqOuj+xU1mi7m3Ti2nwSQJQf/kxEkrz2r2rp2ZLO1pMeKkz2WiDUWgSR+APstqz0uMFcE5yc0qdcg==
+jest-message-util@^25.3.0:
+  version "25.3.0"
+  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-25.3.0.tgz#e3836826fe5ca538a337b87d9bd2648190867f85"
+  integrity sha512-5QNy9Id4WxJbRITEbA1T1kem9bk7y2fD0updZMSTNHtbEDnYOGLDPAuFBhFgVmOZpv0n6OMdVkK+WhyXEPCcOw==
   dependencies:
     "@babel/code-frame" "^7.0.0"
-    "@jest/types" "^25.2.6"
+    "@jest/types" "^25.3.0"
     "@types/stack-utils" "^1.0.1"
     chalk "^3.0.0"
     micromatch "^4.0.2"
     slash "^3.0.0"
     stack-utils "^1.0.1"
 
-jest-mock@^25.2.6:
-  version "25.2.6"
-  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-25.2.6.tgz#8df66eaa55a713d0f2a7dfb4f14507289d24dfa3"
-  integrity sha512-vc4nibavi2RGPdj/MyZy/azuDjZhpYZLvpfgq1fxkhbyTpKVdG7CgmRVKJ7zgLpY5kuMjTzDYA6QnRwhsCU+tA==
+jest-mock@^25.3.0:
+  version "25.3.0"
+  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-25.3.0.tgz#d72644509e40987a732a9a2534a1054f4649402c"
+  integrity sha512-yRn6GbuqB4j3aYu+Z1ezwRiZfp0o9om5uOcBovVtkcRLeBCNP5mT0ysdenUsxAHnQUgGwPOE1wwhtQYe6NKirQ==
   dependencies:
-    "@jest/types" "^25.2.6"
+    "@jest/types" "^25.3.0"
 
 jest-pnp-resolver@^1.2.1:
   version "1.2.1"
@@ -5691,78 +5846,78 @@ jest-regex-util@^25.2.6:
   resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-25.2.6.tgz#d847d38ba15d2118d3b06390056028d0f2fd3964"
   integrity sha512-KQqf7a0NrtCkYmZZzodPftn7fL1cq3GQAFVMn5Hg8uKx/fIenLEobNanUxb7abQ1sjADHBseG/2FGpsv/wr+Qw==
 
-jest-resolve-dependencies@^25.2.7:
-  version "25.2.7"
-  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-25.2.7.tgz#9ca4c62d67cce031a27fa5d5705b4b5b5c029d23"
-  integrity sha512-IrnMzCAh11Xd2gAOJL+ThEW6QO8DyqNdvNkQcaCticDrOAr9wtKT7yT6QBFFjqKFgjjvaVKDs59WdgUhgYnHnQ==
+jest-resolve-dependencies@^25.3.0:
+  version "25.3.0"
+  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-25.3.0.tgz#b0e4ae053dd44ddacc18c6ee12b5b7c28e445a90"
+  integrity sha512-bDUlLYmHW+f7J7KgcY2lkq8EMRqKonRl0XoD4Wp5SJkgAxKJnsaIOlrrVNTfXYf+YOu3VCjm/Ac2hPF2nfsCIA==
   dependencies:
-    "@jest/types" "^25.2.6"
+    "@jest/types" "^25.3.0"
     jest-regex-util "^25.2.6"
-    jest-snapshot "^25.2.7"
+    jest-snapshot "^25.3.0"
 
-jest-resolve@^25.2.6:
-  version "25.2.6"
-  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-25.2.6.tgz#84694ead5da13c2890ac04d4a78699ba937f3896"
-  integrity sha512-7O61GVdcAXkLz/vNGKdF+00A80/fKEAA47AEXVNcZwj75vEjPfZbXDaWFmAQCyXj4oo9y9dC9D+CLA11t8ieGw==
+jest-resolve@^25.3.0:
+  version "25.3.0"
+  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-25.3.0.tgz#cb90a5bbea54a02eccdbbf4126a819595dcf91d6"
+  integrity sha512-IHoQAAybulsJ+ZgWis+ekYKDAoFkVH5Nx/znpb41zRtpxj4fr2WNV9iDqavdSm8GIpMlsfZxbC/fV9DhW0q9VQ==
   dependencies:
-    "@jest/types" "^25.2.6"
+    "@jest/types" "^25.3.0"
     browser-resolve "^1.11.3"
     chalk "^3.0.0"
     jest-pnp-resolver "^1.2.1"
     realpath-native "^2.0.0"
     resolve "^1.15.1"
 
-jest-runner@^25.2.7:
-  version "25.2.7"
-  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-25.2.7.tgz#3676c01dc0104caa8a0ebb8507df382c88f2a1e2"
-  integrity sha512-RFEr71nMrtNwcpoHzie5+fe1w3JQCGMyT2xzNwKe3f88+bK+frM2o1v24gEcPxQ2QqB3COMCe2+1EkElP+qqqQ==
+jest-runner@^25.3.0:
+  version "25.3.0"
+  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-25.3.0.tgz#673ef2ac79d2810eb6b2c1a3f82398375a3d1174"
+  integrity sha512-csDqSC9qGHYWDrzrElzEgFbteztFeZJmKhSgY5jlCIcN0+PhActzRNku0DA1Xa1HxGOb0/AfbP1EGJlP4fGPtA==
   dependencies:
-    "@jest/console" "^25.2.6"
-    "@jest/environment" "^25.2.6"
-    "@jest/test-result" "^25.2.6"
-    "@jest/types" "^25.2.6"
+    "@jest/console" "^25.3.0"
+    "@jest/environment" "^25.3.0"
+    "@jest/test-result" "^25.3.0"
+    "@jest/types" "^25.3.0"
     chalk "^3.0.0"
     exit "^0.1.2"
     graceful-fs "^4.2.3"
-    jest-config "^25.2.7"
-    jest-docblock "^25.2.6"
-    jest-haste-map "^25.2.6"
-    jest-jasmine2 "^25.2.7"
-    jest-leak-detector "^25.2.6"
-    jest-message-util "^25.2.6"
-    jest-resolve "^25.2.6"
-    jest-runtime "^25.2.7"
-    jest-util "^25.2.6"
+    jest-config "^25.3.0"
+    jest-docblock "^25.3.0"
+    jest-haste-map "^25.3.0"
+    jest-jasmine2 "^25.3.0"
+    jest-leak-detector "^25.3.0"
+    jest-message-util "^25.3.0"
+    jest-resolve "^25.3.0"
+    jest-runtime "^25.3.0"
+    jest-util "^25.3.0"
     jest-worker "^25.2.6"
     source-map-support "^0.5.6"
     throat "^5.0.0"
 
-jest-runtime@^25.2.7:
-  version "25.2.7"
-  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-25.2.7.tgz#cb10e695d036671a83aec3a3803163c354043ac9"
-  integrity sha512-Gw3X8KxTTFylu2T/iDSNKRUQXQiPIYUY0b66GwVYa7W8wySkUljKhibQHSq0VhmCAN7vRBEQjlVQ+NFGNmQeBw==
+jest-runtime@^25.3.0:
+  version "25.3.0"
+  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-25.3.0.tgz#af4d40dbcc590fa5de9910cb6a120a13d131050b"
+  integrity sha512-gn5KYB1wxXRM3nfw8fVpthFu60vxQUCr+ShGq41+ZBFF3DRHZRKj3HDWVAVB4iTNBj2y04QeAo5cZ/boYaPg0w==
   dependencies:
-    "@jest/console" "^25.2.6"
-    "@jest/environment" "^25.2.6"
+    "@jest/console" "^25.3.0"
+    "@jest/environment" "^25.3.0"
     "@jest/source-map" "^25.2.6"
-    "@jest/test-result" "^25.2.6"
-    "@jest/transform" "^25.2.6"
-    "@jest/types" "^25.2.6"
+    "@jest/test-result" "^25.3.0"
+    "@jest/transform" "^25.3.0"
+    "@jest/types" "^25.3.0"
     "@types/yargs" "^15.0.0"
     chalk "^3.0.0"
     collect-v8-coverage "^1.0.0"
     exit "^0.1.2"
     glob "^7.1.3"
     graceful-fs "^4.2.3"
-    jest-config "^25.2.7"
-    jest-haste-map "^25.2.6"
-    jest-message-util "^25.2.6"
-    jest-mock "^25.2.6"
+    jest-config "^25.3.0"
+    jest-haste-map "^25.3.0"
+    jest-message-util "^25.3.0"
+    jest-mock "^25.3.0"
     jest-regex-util "^25.2.6"
-    jest-resolve "^25.2.6"
-    jest-snapshot "^25.2.7"
-    jest-util "^25.2.6"
-    jest-validate "^25.2.6"
+    jest-resolve "^25.3.0"
+    jest-snapshot "^25.3.0"
+    jest-util "^25.3.0"
+    jest-validate "^25.3.0"
     realpath-native "^2.0.0"
     slash "^3.0.0"
     strip-bom "^4.0.0"
@@ -5773,24 +5928,24 @@ jest-serializer@^25.2.6:
   resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-25.2.6.tgz#3bb4cc14fe0d8358489dbbefbb8a4e708ce039b7"
   integrity sha512-RMVCfZsezQS2Ww4kB5HJTMaMJ0asmC0BHlnobQC6yEtxiFKIxohFA4QSXSabKwSggaNkqxn6Z2VwdFCjhUWuiQ==
 
-jest-snapshot@^25.2.7:
-  version "25.2.7"
-  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-25.2.7.tgz#7eeafeef4dcbda1c47c8503d2bf5212b6430aac6"
-  integrity sha512-Rm8k7xpGM4tzmYhB6IeRjsOMkXaU8/FOz5XlU6oYwhy53mq6txVNqIKqN1VSiexzpC80oWVxVDfUDt71M6XPOA==
+jest-snapshot@^25.3.0:
+  version "25.3.0"
+  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-25.3.0.tgz#d4feb457494f4aaedcc83fbbf1ca21808fc3df71"
+  integrity sha512-GGpR6Oro2htJPKh5RX4PR1xwo5jCEjtvSPLW1IS7N85y+2bWKbiknHpJJRKSdGXghElb5hWaeQASJI4IiRayGg==
   dependencies:
     "@babel/types" "^7.0.0"
-    "@jest/types" "^25.2.6"
+    "@jest/types" "^25.3.0"
     "@types/prettier" "^1.19.0"
     chalk "^3.0.0"
-    expect "^25.2.7"
-    jest-diff "^25.2.6"
+    expect "^25.3.0"
+    jest-diff "^25.3.0"
     jest-get-type "^25.2.6"
-    jest-matcher-utils "^25.2.7"
-    jest-message-util "^25.2.6"
-    jest-resolve "^25.2.6"
+    jest-matcher-utils "^25.3.0"
+    jest-message-util "^25.3.0"
+    jest-resolve "^25.3.0"
     make-dir "^3.0.0"
     natural-compare "^1.4.0"
-    pretty-format "^25.2.6"
+    pretty-format "^25.3.0"
     semver "^6.3.0"
 
 jest-util@^25.2.6:
@@ -5803,28 +5958,38 @@ jest-util@^25.2.6:
     is-ci "^2.0.0"
     make-dir "^3.0.0"
 
-jest-validate@^25.2.6:
-  version "25.2.6"
-  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-25.2.6.tgz#ab3631fb97e242c42b09ca53127abe0b12e9125e"
-  integrity sha512-a4GN7hYbqQ3Rt9iHsNLFqQz7HDV7KiRPCwPgo5nqtTIWNZw7gnT8KchG+Riwh+UTSn8REjFCodGp50KX/fRNgQ==
+jest-util@^25.3.0:
+  version "25.3.0"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-25.3.0.tgz#e3b0064165818f10d78514696fd25efba82cf049"
+  integrity sha512-dc625P/KS/CpWTJJJxKc4bA3A6c+PJGBAqS8JTJqx4HqPoKNqXg/Ec8biL2Z1TabwK7E7Ilf0/ukSEXM1VwzNA==
   dependencies:
-    "@jest/types" "^25.2.6"
+    "@jest/types" "^25.3.0"
+    chalk "^3.0.0"
+    is-ci "^2.0.0"
+    make-dir "^3.0.0"
+
+jest-validate@^25.3.0:
+  version "25.3.0"
+  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-25.3.0.tgz#eb95fdee0039647bcd5d4be641b21e4a142a880c"
+  integrity sha512-3WuXgIZ4HXUvW6gk9twFFkT9j6zUorKnF2oEY8VEsHb7x5LGvVlN3WUsbqazVKuyXwvikO2zFJ/YTySMsMje2w==
+  dependencies:
+    "@jest/types" "^25.3.0"
     camelcase "^5.3.1"
     chalk "^3.0.0"
     jest-get-type "^25.2.6"
     leven "^3.1.0"
-    pretty-format "^25.2.6"
+    pretty-format "^25.3.0"
 
-jest-watcher@^25.2.7:
-  version "25.2.7"
-  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-25.2.7.tgz#01db4332d34d14c03c9ef22255125a3b07f997bc"
-  integrity sha512-RdHuW+f49tahWtluTnUdZ2iPliebleROI2L/J5phYrUS6DPC9RB3SuUtqYyYhGZJsbvRSuLMIlY/cICJ+PIecw==
+jest-watcher@^25.3.0:
+  version "25.3.0"
+  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-25.3.0.tgz#fd03fd5ca52f02bd3161ab177466bf1bfdd34e5c"
+  integrity sha512-dtFkfidFCS9Ucv8azOg2hkiY3sgJEHeTLtGFHS+jfBEE7eRtrO6+2r1BokyDkaG2FOD7485r/SgpC1MFAENfeA==
   dependencies:
-    "@jest/test-result" "^25.2.6"
-    "@jest/types" "^25.2.6"
+    "@jest/test-result" "^25.3.0"
+    "@jest/types" "^25.3.0"
     ansi-escapes "^4.2.1"
     chalk "^3.0.0"
-    jest-util "^25.2.6"
+    jest-util "^25.3.0"
     string-length "^3.1.0"
 
 jest-worker@^25.2.6:
@@ -5835,14 +6000,14 @@ jest-worker@^25.2.6:
     merge-stream "^2.0.0"
     supports-color "^7.0.0"
 
-jest@~25.2.7:
-  version "25.2.7"
-  resolved "https://registry.yarnpkg.com/jest/-/jest-25.2.7.tgz#3929a5f35cdd496f7756876a206b99a94e1e09ae"
-  integrity sha512-XV1n/CE2McCikl4tfpCY950RytHYvxdo/wvtgmn/qwA8z1s16fuvgFL/KoPrrmkqJTaPMUlLVE58pwiaTX5TdA==
+jest@~25.3.0:
+  version "25.3.0"
+  resolved "https://registry.yarnpkg.com/jest/-/jest-25.3.0.tgz#7a5e59741d94b8662664c77a9f346246d6bf228b"
+  integrity sha512-iKd5ShQSHzFT5IL/6h5RZJhApgqXSoPxhp5HEi94v6OAw9QkF8T7X+liEU2eEHJ1eMFYTHmeWLrpBWulsDpaUg==
   dependencies:
-    "@jest/core" "^25.2.7"
+    "@jest/core" "^25.3.0"
     import-local "^3.0.2"
-    jest-cli "^25.2.7"
+    jest-cli "^25.3.0"
 
 jmespath@0.15.0:
   version "0.15.0"
@@ -7473,12 +7638,12 @@ prettier@~2.0.2:
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.0.2.tgz#1ba8f3eb92231e769b7fcd7cb73ae1b6b74ade08"
   integrity sha512-5xJQIPT8BraI7ZnaDwSbu5zLrB6vvi8hVV58yHQ+QK64qrY40dULy0HSRlQ2/2IdzeBpjhDkqdcFBnFeDEMVdg==
 
-pretty-format@^25.2.6:
-  version "25.2.6"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-25.2.6.tgz#542a1c418d019bbf1cca2e3620443bc1323cb8d7"
-  integrity sha512-DEiWxLBaCHneffrIT4B+TpMvkV9RNvvJrd3lY9ew1CEQobDzEXmYT1mg0hJhljZty7kCc10z13ohOFAE8jrUDg==
+pretty-format@^25.3.0:
+  version "25.3.0"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-25.3.0.tgz#d0a4f988ff4a6cd350342fdabbb809aeb4d49ad5"
+  integrity sha512-wToHwF8bkQknIcFkBqNfKu4+UZqnrLn/Vr+wwKQwwvPzkBfDDKp/qIabFqdgtoi5PEnM8LFByVsOrHoa3SpTVA==
   dependencies:
-    "@jest/types" "^25.2.6"
+    "@jest/types" "^25.3.0"
     ansi-regex "^5.0.0"
     ansi-styles "^4.0.0"
     react-is "^16.12.0"

From e042a44cf51fdd537e1d568240b594ebd6f5f0bb Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 9 Apr 2020 04:17:23 +0000
Subject: [PATCH 38/54] build(deps-dev): bump prettier from 2.0.2 to 2.0.4 in
 /backend

Bumps [prettier](https://github.com/prettier/prettier) from 2.0.2 to 2.0.4.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/prettier/compare/2.0.2...2.0.4)

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 6e4a05c12..dd4590acf 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -131,7 +131,7 @@
     "eslint-plugin-standard": "~4.0.1",
     "jest": "~25.2.7",
     "nodemon": "~2.0.2",
-    "prettier": "~2.0.2",
+    "prettier": "~2.0.4",
     "rosie": "^2.0.1",
     "supertest": "~4.0.2"
   },
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 19e716fd5..c9a371aec 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -7468,10 +7468,10 @@ prettier-linter-helpers@^1.0.0:
   dependencies:
     fast-diff "^1.1.2"
 
-prettier@~2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.0.2.tgz#1ba8f3eb92231e769b7fcd7cb73ae1b6b74ade08"
-  integrity sha512-5xJQIPT8BraI7ZnaDwSbu5zLrB6vvi8hVV58yHQ+QK64qrY40dULy0HSRlQ2/2IdzeBpjhDkqdcFBnFeDEMVdg==
+prettier@~2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.0.4.tgz#2d1bae173e355996ee355ec9830a7a1ee05457ef"
+  integrity sha512-SVJIQ51spzFDvh4fIbCLvciiDMCrRhlN3mbZvv/+ycjvmF5E73bKdGfU8QDLNmjYJf+lsGnDBC4UUnvTe5OO0w==
 
 pretty-format@^25.2.6:
   version "25.2.6"

From b131e4113363cb2777e67ca3effe5178efe22214 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 9 Apr 2020 06:57:24 +0000
Subject: [PATCH 39/54] build(deps-dev): bump babel-jest from 25.2.6 to 25.3.0
 in /webapp

Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest) from 25.2.6 to 25.3.0.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v25.3.0/packages/babel-jest)

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

diff --git a/webapp/package.json b/webapp/package.json
index f6200cef9..905d0a864 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -111,7 +111,7 @@
     "async-validator": "^3.2.4",
     "babel-core": "~7.0.0-bridge.0",
     "babel-eslint": "~10.1.0",
-    "babel-jest": "~25.2.6",
+    "babel-jest": "~25.3.0",
     "babel-loader": "~8.1.0",
     "babel-plugin-require-context-hook": "^1.0.0",
     "babel-preset-vue": "~2.0.2",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index a5e4fd1e2..ec9ce0ae4 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -531,13 +531,27 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-bigint@^7.0.0":
+"@babel/plugin-syntax-async-generators@^7.8.4":
+  version "7.8.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d"
+  integrity sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
+"@babel/plugin-syntax-bigint@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz#4c9a6f669f5d0cdf1b90a1671e9a146be5300cea"
   integrity sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
+"@babel/plugin-syntax-class-properties@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.8.3.tgz#6cb933a8872c8d359bfde69bbeaae5162fd1e8f7"
+  integrity sha512-UcAyQWg2bAN647Q+O811tG9MrJ38Z10jjhQdKNAL8fsyPzE3cCN/uT+f55cFVY4aGO4jqJAvmqsuY3GQDwAoXg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+
 "@babel/plugin-syntax-decorators@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.8.3.tgz#8d2c15a9f1af624b0025f961682a9d53d3001bda"
@@ -559,6 +573,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
+"@babel/plugin-syntax-json-strings@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a"
+  integrity sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.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"
@@ -566,6 +587,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
 
+"@babel/plugin-syntax-logical-assignment-operators@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.8.3.tgz#3995d7d7ffff432f6ddc742b47e730c054599897"
+  integrity sha512-Zpg2Sgc++37kuFl6ppq2Q7Awc6E6AIW671x5PY8E/f7MCIyPPGK/EoeZXvvY3P42exZ3Q4/t3YOzP/HiN79jDg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+
 "@babel/plugin-syntax-nullish-coalescing-operator@^7.8.0":
   version "7.8.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.0.tgz#5d8f24ecffa4ae74164e53264953c5ea8ba6d149"
@@ -573,6 +601,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
+"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9"
+  integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
 "@babel/plugin-syntax-numeric-separator@^7.8.0", "@babel/plugin-syntax-numeric-separator@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.8.3.tgz#0e3fb63e09bea1b11e96467271c8308007e7c41f"
@@ -580,13 +615,20 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-syntax-object-rest-spread@^7.0.0", "@babel/plugin-syntax-object-rest-spread@^7.8.0":
+"@babel/plugin-syntax-object-rest-spread@^7.8.0":
   version "7.8.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.0.tgz#9b37d580d459682364d8602494c69145b394fd4c"
   integrity sha512-dt89fDlkfkTrQcy5KavMQPyF2A6tR0kYp8HAnIoQv5hO34iAUffHghP/hMGd7Gf/+uYTmLQO0ar7peX1SUWyIA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
+"@babel/plugin-syntax-object-rest-spread@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871"
+  integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
 "@babel/plugin-syntax-optional-catch-binding@^7.8.0":
   version "7.8.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.0.tgz#180c7bdd6b7fd81cc6d18269de12d5ddd60cabce"
@@ -594,6 +636,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
+"@babel/plugin-syntax-optional-catch-binding@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1"
+  integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
 "@babel/plugin-syntax-optional-chaining@^7.8.0":
   version "7.8.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.0.tgz#c40f4d4d6a4f5e71d2bfd949b0a7f1e1e6792fe0"
@@ -601,6 +650,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
+"@babel/plugin-syntax-optional-chaining@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a"
+  integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.0"
+
 "@babel/plugin-syntax-top-level-await@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.8.3.tgz#3acdece695e6b13aaf57fc291d1a800950c71391"
@@ -1463,21 +1519,21 @@
     jest-runner "^25.2.7"
     jest-runtime "^25.2.7"
 
-"@jest/transform@^25.2.6":
-  version "25.2.6"
-  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-25.2.6.tgz#007fd946dedf12d2a9eb5d4154faf1991d5f61ff"
-  integrity sha512-rZnjCjZf9avPOf9q/w9RUZ9Uc29JmB53uIXNJmNz04QbDMD5cR/VjfikiMKajBsXe2vnFl5sJ4RTt+9HPicauQ==
+"@jest/transform@^25.2.6", "@jest/transform@^25.3.0":
+  version "25.3.0"
+  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-25.3.0.tgz#083c5447d5307d9b9494d6968115b647460e71f1"
+  integrity sha512-W01p8kTDvvEX6kd0tJc7Y5VdYyFaKwNWy1HQz6Jqlhu48z/8Gxp+yFCDVj+H8Rc7ezl3Mg0hDaGuFVkmHOqirg==
   dependencies:
     "@babel/core" "^7.1.0"
-    "@jest/types" "^25.2.6"
+    "@jest/types" "^25.3.0"
     babel-plugin-istanbul "^6.0.0"
     chalk "^3.0.0"
     convert-source-map "^1.4.0"
     fast-json-stable-stringify "^2.0.0"
     graceful-fs "^4.2.3"
-    jest-haste-map "^25.2.6"
+    jest-haste-map "^25.3.0"
     jest-regex-util "^25.2.6"
-    jest-util "^25.2.6"
+    jest-util "^25.3.0"
     micromatch "^4.0.2"
     pirates "^4.0.1"
     realpath-native "^2.0.0"
@@ -1485,10 +1541,10 @@
     source-map "^0.6.1"
     write-file-atomic "^3.0.0"
 
-"@jest/types@^25.2.6":
-  version "25.2.6"
-  resolved "https://registry.yarnpkg.com/@jest/types/-/types-25.2.6.tgz#c12f44af9bed444438091e4b59e7ed05f8659cb6"
-  integrity sha512-myJTTV37bxK7+3NgKc4Y/DlQ5q92/NOwZsZ+Uch7OXdElxOg61QYc72fPYNAjlvbnJ2YvbXLamIsa9tj48BmyQ==
+"@jest/types@^25.2.6", "@jest/types@^25.3.0":
+  version "25.3.0"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-25.3.0.tgz#88f94b277a1d028fd7117bc1f74451e0fc2131e7"
+  integrity sha512-UkaDNewdqXAmCDbN2GlUM6amDKS78eCqiw/UmF5nE0mmLTd6moJkiZJML/X52Ke3LH7Swhw883IRXq8o9nWjVw==
   dependencies:
     "@types/istanbul-lib-coverage" "^2.0.0"
     "@types/istanbul-reports" "^1.1.1"
@@ -2674,10 +2730,10 @@
   dependencies:
     "@types/node" "*"
 
-"@types/babel__core@^7.1.0":
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.1.tgz#ce9a9e5d92b7031421e1d0d74ae59f572ba48be6"
-  integrity sha512-+hjBtgcFPYyCTo0A15+nxrCVJL7aC6Acg87TXd5OW3QhHswdrOLoles+ldL2Uk8q++7yIfl4tURtztccdeeyOw==
+"@types/babel__core@^7.1.7":
+  version "7.1.7"
+  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.7.tgz#1dacad8840364a57c98d0dd4855c6dd3752c6b89"
+  integrity sha512-RL62NqSFPCDK2FM1pSDH0scHpJvsXtZNiYlMB73DgPBaG1E38ZYVL+ei5EkWRbr+KC4YNiAUNBnRj+bgwpgjMw==
   dependencies:
     "@babel/parser" "^7.1.0"
     "@babel/types" "^7.0.0"
@@ -4469,16 +4525,16 @@ babel-helper-vue-jsx-merge-props@^2.0.2:
   resolved "https://registry.yarnpkg.com/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-2.0.3.tgz#22aebd3b33902328e513293a8e4992b384f9f1b6"
   integrity sha512-gsLiKK7Qrb7zYJNgiXKpXblxbV5ffSwR0f5whkPAaBAR4fhi6bwRZxX9wBlIc5M/v8CCkXUbXZL4N/nSE97cqg==
 
-babel-jest@^25.2.6, babel-jest@~25.2.6:
-  version "25.2.6"
-  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-25.2.6.tgz#fe67ff4d0db3626ca8082da8881dd5e84e07ae75"
-  integrity sha512-MDJOAlwtIeIQiGshyX0d2PxTbV73xZMpNji40ivVTPQOm59OdRR9nYCkffqI7ugtsK4JR98HgNKbDbuVf4k5QQ==
+babel-jest@^25.2.6, babel-jest@~25.3.0:
+  version "25.3.0"
+  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-25.3.0.tgz#999d0c19e8427f66b796bf9ea233eedf087b957c"
+  integrity sha512-qiXeX1Cmw4JZ5yQ4H57WpkO0MZ61Qj+YnsVUwAMnDV5ls+yHon11XjarDdgP7H8lTmiEi6biiZA8y3Tmvx6pCg==
   dependencies:
-    "@jest/transform" "^25.2.6"
-    "@jest/types" "^25.2.6"
-    "@types/babel__core" "^7.1.0"
+    "@jest/transform" "^25.3.0"
+    "@jest/types" "^25.3.0"
+    "@types/babel__core" "^7.1.7"
     babel-plugin-istanbul "^6.0.0"
-    babel-preset-jest "^25.2.6"
+    babel-preset-jest "^25.3.0"
     chalk "^3.0.0"
     slash "^3.0.0"
 
@@ -4787,14 +4843,29 @@ babel-polyfill@6.26.0:
     core-js "^2.5.0"
     regenerator-runtime "^0.10.5"
 
-babel-preset-jest@^25.2.6:
-  version "25.2.6"
-  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-25.2.6.tgz#5d3f7c99e2a8508d61775c9d68506d143b7f71b5"
-  integrity sha512-Xh2eEAwaLY9+SyMt/xmGZDnXTW/7pSaBPG0EMo7EuhvosFKVWYB6CqwYD31DaEQuoTL090oDZ0FEqygffGRaSQ==
+babel-preset-current-node-syntax@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-0.1.2.tgz#fb4a4c51fe38ca60fede1dc74ab35eb843cb41d6"
+  integrity sha512-u/8cS+dEiK1SFILbOC8/rUI3ml9lboKuuMvZ/4aQnQmhecQAgPw5ew066C1ObnEAUmlx7dv/s2z52psWEtLNiw==
+  dependencies:
+    "@babel/plugin-syntax-async-generators" "^7.8.4"
+    "@babel/plugin-syntax-bigint" "^7.8.3"
+    "@babel/plugin-syntax-class-properties" "^7.8.3"
+    "@babel/plugin-syntax-json-strings" "^7.8.3"
+    "@babel/plugin-syntax-logical-assignment-operators" "^7.8.3"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
+    "@babel/plugin-syntax-numeric-separator" "^7.8.3"
+    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
+    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
+
+babel-preset-jest@^25.3.0:
+  version "25.3.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-25.3.0.tgz#9ab40aee52a19bdc52b8b1ec2403d5914ac3d86b"
+  integrity sha512-tjdvLKNMwDI9r+QWz9sZUQGTq1dpoxjUqFUpEasAc7MOtHg9XuLT2fx0udFG+k1nvMV0WvHHVAN7VmCZ+1Zxbw==
   dependencies:
-    "@babel/plugin-syntax-bigint" "^7.0.0"
-    "@babel/plugin-syntax-object-rest-spread" "^7.0.0"
     babel-plugin-jest-hoist "^25.2.6"
+    babel-preset-current-node-syntax "^0.1.2"
 
 "babel-preset-minify@^0.5.0 || 0.6.0-alpha.5":
   version "0.5.0"
@@ -10094,6 +10165,25 @@ jest-haste-map@^25.2.6:
   optionalDependencies:
     fsevents "^2.1.2"
 
+jest-haste-map@^25.3.0:
+  version "25.3.0"
+  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-25.3.0.tgz#b7683031c9c9ddc0521d311564108b244b11e4c6"
+  integrity sha512-LjXaRa+F8wwtSxo9G+hHD/Cp63PPQzvaBL9XCVoJD2rrcJO0Zr2+YYzAFWWYJ5GlPUkoaJFJtOuk0sL6MJY80A==
+  dependencies:
+    "@jest/types" "^25.3.0"
+    anymatch "^3.0.3"
+    fb-watchman "^2.0.0"
+    graceful-fs "^4.2.3"
+    jest-serializer "^25.2.6"
+    jest-util "^25.3.0"
+    jest-worker "^25.2.6"
+    micromatch "^4.0.2"
+    sane "^4.0.3"
+    walker "^1.0.7"
+    which "^2.0.2"
+  optionalDependencies:
+    fsevents "^2.1.2"
+
 jest-jasmine2@^25.2.7:
   version "25.2.7"
   resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-25.2.7.tgz#55ff87f8f462ef0e2f16fd19430b8be8bcebef0e"
@@ -10277,6 +10367,16 @@ jest-util@^25.2.6:
     is-ci "^2.0.0"
     make-dir "^3.0.0"
 
+jest-util@^25.3.0:
+  version "25.3.0"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-25.3.0.tgz#e3b0064165818f10d78514696fd25efba82cf049"
+  integrity sha512-dc625P/KS/CpWTJJJxKc4bA3A6c+PJGBAqS8JTJqx4HqPoKNqXg/Ec8biL2Z1TabwK7E7Ilf0/ukSEXM1VwzNA==
+  dependencies:
+    "@jest/types" "^25.3.0"
+    chalk "^3.0.0"
+    is-ci "^2.0.0"
+    make-dir "^3.0.0"
+
 jest-validate@^25.2.6:
   version "25.2.6"
   resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-25.2.6.tgz#ab3631fb97e242c42b09ca53127abe0b12e9125e"

From 101dfd727823868c9f4fd9de894e78c8d31fbcae Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 9 Apr 2020 10:55:44 +0000
Subject: [PATCH 40/54] build(deps-dev): bump jest from 25.2.7 to 25.3.0 in
 /webapp

Bumps [jest](https://github.com/facebook/jest) from 25.2.7 to 25.3.0.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/compare/v25.2.7...v25.3.0)

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

diff --git a/webapp/package.json b/webapp/package.json
index 905d0a864..83d543eea 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -131,7 +131,7 @@
     "faker": "^4.1.0",
     "flush-promises": "^1.0.2",
     "identity-obj-proxy": "^3.0.0",
-    "jest": "~25.2.7",
+    "jest": "~25.3.0",
     "mutation-observer": "^1.0.3",
     "node-sass": "~4.13.1",
     "prettier": "~2.0.4",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index ec9ce0ae4..5960b9961 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -1395,43 +1395,43 @@
   resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd"
   integrity sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw==
 
-"@jest/console@^25.2.6":
-  version "25.2.6"
-  resolved "https://registry.yarnpkg.com/@jest/console/-/console-25.2.6.tgz#f594847ec8aef3cf27f448abe97e76e491212e97"
-  integrity sha512-bGp+0PicZVCEhb+ifnW9wpKWONNdkhtJsRE7ap729hiAfTvCN6VhGx0s/l/V/skA2pnyqq+N/7xl9ZWfykDpsg==
+"@jest/console@^25.3.0":
+  version "25.3.0"
+  resolved "https://registry.yarnpkg.com/@jest/console/-/console-25.3.0.tgz#33b56b81238427bf3ebe3f7b3378d2f79cdbd409"
+  integrity sha512-LvSDNqpmZIZyweFaEQ6wKY7CbexPitlsLHGJtcooNECo0An/w49rFhjCJzu6efeb6+a3ee946xss1Jcd9r03UQ==
   dependencies:
     "@jest/source-map" "^25.2.6"
     chalk "^3.0.0"
-    jest-util "^25.2.6"
+    jest-util "^25.3.0"
     slash "^3.0.0"
 
-"@jest/core@^25.2.7":
-  version "25.2.7"
-  resolved "https://registry.yarnpkg.com/@jest/core/-/core-25.2.7.tgz#58d697687e94ee644273d15e4eed6a20e27187cd"
-  integrity sha512-Nd6ELJyR+j0zlwhzkfzY70m04hAur0VnMwJXVe4VmmD/SaQ6DEyal++ERQ1sgyKIKKEqRuui6k/R0wHLez4P+g==
+"@jest/core@^25.3.0":
+  version "25.3.0"
+  resolved "https://registry.yarnpkg.com/@jest/core/-/core-25.3.0.tgz#80f97a7a8b59dde741a24f30871cc26d0197d426"
+  integrity sha512-+D5a/tFf6pA/Gqft2DLBp/yeSRgXhlJ+Wpst0X/ZkfTRP54qDR3C61VfHwaex+GzZBiTcE9vQeoZ2v5T10+Mqw==
   dependencies:
-    "@jest/console" "^25.2.6"
-    "@jest/reporters" "^25.2.6"
-    "@jest/test-result" "^25.2.6"
-    "@jest/transform" "^25.2.6"
-    "@jest/types" "^25.2.6"
+    "@jest/console" "^25.3.0"
+    "@jest/reporters" "^25.3.0"
+    "@jest/test-result" "^25.3.0"
+    "@jest/transform" "^25.3.0"
+    "@jest/types" "^25.3.0"
     ansi-escapes "^4.2.1"
     chalk "^3.0.0"
     exit "^0.1.2"
     graceful-fs "^4.2.3"
-    jest-changed-files "^25.2.6"
-    jest-config "^25.2.7"
-    jest-haste-map "^25.2.6"
-    jest-message-util "^25.2.6"
+    jest-changed-files "^25.3.0"
+    jest-config "^25.3.0"
+    jest-haste-map "^25.3.0"
+    jest-message-util "^25.3.0"
     jest-regex-util "^25.2.6"
-    jest-resolve "^25.2.6"
-    jest-resolve-dependencies "^25.2.7"
-    jest-runner "^25.2.7"
-    jest-runtime "^25.2.7"
-    jest-snapshot "^25.2.7"
-    jest-util "^25.2.6"
-    jest-validate "^25.2.6"
-    jest-watcher "^25.2.7"
+    jest-resolve "^25.3.0"
+    jest-resolve-dependencies "^25.3.0"
+    jest-runner "^25.3.0"
+    jest-runtime "^25.3.0"
+    jest-snapshot "^25.3.0"
+    jest-util "^25.3.0"
+    jest-validate "^25.3.0"
+    jest-watcher "^25.3.0"
     micromatch "^4.0.2"
     p-each-series "^2.1.0"
     realpath-native "^2.0.0"
@@ -1439,36 +1439,36 @@
     slash "^3.0.0"
     strip-ansi "^6.0.0"
 
-"@jest/environment@^25.2.6":
-  version "25.2.6"
-  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-25.2.6.tgz#8f7931e79abd81893ce88b7306f0cc4744835000"
-  integrity sha512-17WIw+wCb9drRNFw1hi8CHah38dXVdOk7ga9exThhGtXlZ9mK8xH4DjSB9uGDGXIWYSHmrxoyS6KJ7ywGr7bzg==
+"@jest/environment@^25.3.0":
+  version "25.3.0"
+  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-25.3.0.tgz#587f28ddb4b0dfe97404d3d4a4c9dbfa0245fb2e"
+  integrity sha512-vgooqwJTHLLak4fE+TaCGeYP7Tz1Y3CKOsNxR1sE0V3nx3KRUHn3NUnt+wbcfd5yQWKZQKAfW6wqbuwQLrXo3g==
   dependencies:
-    "@jest/fake-timers" "^25.2.6"
-    "@jest/types" "^25.2.6"
-    jest-mock "^25.2.6"
+    "@jest/fake-timers" "^25.3.0"
+    "@jest/types" "^25.3.0"
+    jest-mock "^25.3.0"
 
-"@jest/fake-timers@^25.2.6":
-  version "25.2.6"
-  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-25.2.6.tgz#239dbde3f56badf7d05bcf888f5d669296077cad"
-  integrity sha512-A6qtDIA2zg/hVgUJJYzQSHFBIp25vHdSxW/s4XmTJAYxER6eL0NQdQhe4+232uUSviKitubHGXXirt5M7blPiA==
+"@jest/fake-timers@^25.3.0":
+  version "25.3.0"
+  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-25.3.0.tgz#995aad36d5c8984165ca5db12e740ab8dbf7042a"
+  integrity sha512-NHAj7WbsyR3qBJPpBwSwqaq2WluIvUQsyzpJTN7XDVk7VnlC/y1BAnaYZL3vbPIP8Nhm0Ae5DJe0KExr/SdMJQ==
   dependencies:
-    "@jest/types" "^25.2.6"
-    jest-message-util "^25.2.6"
-    jest-mock "^25.2.6"
-    jest-util "^25.2.6"
+    "@jest/types" "^25.3.0"
+    jest-message-util "^25.3.0"
+    jest-mock "^25.3.0"
+    jest-util "^25.3.0"
     lolex "^5.0.0"
 
-"@jest/reporters@^25.2.6":
-  version "25.2.6"
-  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-25.2.6.tgz#6d87e40fb15adb69e22bb83aa02a4d88b2253b5f"
-  integrity sha512-DRMyjaxcd6ZKctiXNcuVObnPwB1eUs7xrUVu0J2V0p5/aZJei5UM9GL3s/bmN4hRV8Mt3zXh+/9X2o0Q4ClZIA==
+"@jest/reporters@^25.3.0":
+  version "25.3.0"
+  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-25.3.0.tgz#7f39f0e6911561cc5112a1b54656de18faee269b"
+  integrity sha512-1u0ZBygs0C9DhdYgLCrRfZfNKQa+9+J7Uo+Z9z0RWLHzgsxhoG32lrmMOtUw48yR6bLNELdvzormwUqSk4H4Vg==
   dependencies:
     "@bcoe/v8-coverage" "^0.2.3"
-    "@jest/console" "^25.2.6"
-    "@jest/test-result" "^25.2.6"
-    "@jest/transform" "^25.2.6"
-    "@jest/types" "^25.2.6"
+    "@jest/console" "^25.3.0"
+    "@jest/test-result" "^25.3.0"
+    "@jest/transform" "^25.3.0"
+    "@jest/types" "^25.3.0"
     chalk "^3.0.0"
     collect-v8-coverage "^1.0.0"
     exit "^0.1.2"
@@ -1477,10 +1477,10 @@
     istanbul-lib-instrument "^4.0.0"
     istanbul-lib-report "^3.0.0"
     istanbul-lib-source-maps "^4.0.0"
-    istanbul-reports "^3.0.0"
-    jest-haste-map "^25.2.6"
-    jest-resolve "^25.2.6"
-    jest-util "^25.2.6"
+    istanbul-reports "^3.0.2"
+    jest-haste-map "^25.3.0"
+    jest-resolve "^25.3.0"
+    jest-util "^25.3.0"
     jest-worker "^25.2.6"
     slash "^3.0.0"
     source-map "^0.6.0"
@@ -1499,27 +1499,27 @@
     graceful-fs "^4.2.3"
     source-map "^0.6.0"
 
-"@jest/test-result@^25.2.6":
-  version "25.2.6"
-  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-25.2.6.tgz#f6082954955313eb96f6cabf9fb14f8017826916"
-  integrity sha512-gmGgcF4qz/pkBzyfJuVHo2DA24kIgVQ5Pf/VpW4QbyMLSegi8z+9foSZABfIt5se6k0fFj/3p/vrQXdaOgit0w==
+"@jest/test-result@^25.3.0":
+  version "25.3.0"
+  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-25.3.0.tgz#137fab5e5c6fed36e5d40735d1eb029325e3bf06"
+  integrity sha512-mqrGuiiPXl1ap09Mydg4O782F3ouDQfsKqtQzIjitpwv3t1cHDwCto21jThw6WRRE+dKcWQvLG70GpyLJICfGw==
   dependencies:
-    "@jest/console" "^25.2.6"
-    "@jest/types" "^25.2.6"
+    "@jest/console" "^25.3.0"
+    "@jest/types" "^25.3.0"
     "@types/istanbul-lib-coverage" "^2.0.0"
     collect-v8-coverage "^1.0.0"
 
-"@jest/test-sequencer@^25.2.7":
-  version "25.2.7"
-  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-25.2.7.tgz#e4331f7b4850e34289b9a5c8ec8a2c03b400da8f"
-  integrity sha512-s2uYGOXONDSTJQcZJ9A3Zkg3hwe53RlX1HjUNqjUy3HIqwgwCKJbnAKYsORPbhxXi3ARMKA7JNBi9arsTxXoYw==
+"@jest/test-sequencer@^25.3.0":
+  version "25.3.0"
+  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-25.3.0.tgz#271ad5f2b8f8137d092ccedc87e16a50f8676209"
+  integrity sha512-Xvns3xbji7JCvVcDGvqJ/pf4IpmohPODumoPEZJ0/VgC5gI4XaNVIBET2Dq5Czu6Gk3xFcmhtthh/MBOTljdNg==
   dependencies:
-    "@jest/test-result" "^25.2.6"
-    jest-haste-map "^25.2.6"
-    jest-runner "^25.2.7"
-    jest-runtime "^25.2.7"
+    "@jest/test-result" "^25.3.0"
+    jest-haste-map "^25.3.0"
+    jest-runner "^25.3.0"
+    jest-runtime "^25.3.0"
 
-"@jest/transform@^25.2.6", "@jest/transform@^25.3.0":
+"@jest/transform@^25.3.0":
   version "25.3.0"
   resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-25.3.0.tgz#083c5447d5307d9b9494d6968115b647460e71f1"
   integrity sha512-W01p8kTDvvEX6kd0tJc7Y5VdYyFaKwNWy1HQz6Jqlhu48z/8Gxp+yFCDVj+H8Rc7ezl3Mg0hDaGuFVkmHOqirg==
@@ -1541,7 +1541,7 @@
     source-map "^0.6.1"
     write-file-atomic "^3.0.0"
 
-"@jest/types@^25.2.6", "@jest/types@^25.3.0":
+"@jest/types@^25.3.0":
   version "25.3.0"
   resolved "https://registry.yarnpkg.com/@jest/types/-/types-25.3.0.tgz#88f94b277a1d028fd7117bc1f74451e0fc2131e7"
   integrity sha512-UkaDNewdqXAmCDbN2GlUM6amDKS78eCqiw/UmF5nE0mmLTd6moJkiZJML/X52Ke3LH7Swhw883IRXq8o9nWjVw==
@@ -4525,7 +4525,7 @@ babel-helper-vue-jsx-merge-props@^2.0.2:
   resolved "https://registry.yarnpkg.com/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-2.0.3.tgz#22aebd3b33902328e513293a8e4992b384f9f1b6"
   integrity sha512-gsLiKK7Qrb7zYJNgiXKpXblxbV5ffSwR0f5whkPAaBAR4fhi6bwRZxX9wBlIc5M/v8CCkXUbXZL4N/nSE97cqg==
 
-babel-jest@^25.2.6, babel-jest@~25.3.0:
+babel-jest@^25.3.0, babel-jest@~25.3.0:
   version "25.3.0"
   resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-25.3.0.tgz#999d0c19e8427f66b796bf9ea233eedf087b957c"
   integrity sha512-qiXeX1Cmw4JZ5yQ4H57WpkO0MZ61Qj+YnsVUwAMnDV5ls+yHon11XjarDdgP7H8lTmiEi6biiZA8y3Tmvx6pCg==
@@ -7764,16 +7764,16 @@ expand-brackets@^2.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
-expect@^25.2.7:
-  version "25.2.7"
-  resolved "https://registry.yarnpkg.com/expect/-/expect-25.2.7.tgz#509b79f47502835f4071ff3ecc401f2eaecca709"
-  integrity sha512-yA+U2Ph0MkMsJ9N8q5hs9WgWI6oJYfecdXta6LkP/alY/jZZL1MHlJ2wbLh60Ucqf3G+51ytbqV3mlGfmxkpNw==
+expect@^25.3.0:
+  version "25.3.0"
+  resolved "https://registry.yarnpkg.com/expect/-/expect-25.3.0.tgz#5fd36e51befd05afb7184bc954f8a4792d184c71"
+  integrity sha512-buboTXML2h/L0Kh44Ys2Cx49mX20ISc5KDirkxIs3Q9AJv0kazweUAbukegr+nHDOvFRKmxdojjIHCjqAceYfg==
   dependencies:
-    "@jest/types" "^25.2.6"
+    "@jest/types" "^25.3.0"
     ansi-styles "^4.0.0"
     jest-get-type "^25.2.6"
-    jest-matcher-utils "^25.2.7"
-    jest-message-util "^25.2.6"
+    jest-matcher-utils "^25.3.0"
+    jest-message-util "^25.3.0"
     jest-regex-util "^25.2.6"
 
 express@^4.16.3, express@^4.17.0, express@^4.17.1, express@~4.17.1:
@@ -10004,10 +10004,10 @@ istanbul-lib-source-maps@^4.0.0:
     istanbul-lib-coverage "^3.0.0"
     source-map "^0.6.1"
 
-istanbul-reports@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.0.0.tgz#d4d16d035db99581b6194e119bbf36c963c5eb70"
-  integrity sha512-2osTcC8zcOSUkImzN2EWQta3Vdi4WjjKw99P2yWx5mLnigAM0Rd5uYFn1cf2i/Ois45GkNjaoTqc5CxgMSX80A==
+istanbul-reports@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.0.2.tgz#d593210e5000683750cb09fc0644e4b6e27fd53b"
+  integrity sha512-9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw==
   dependencies:
     html-escaper "^2.0.0"
     istanbul-lib-report "^3.0.0"
@@ -10037,108 +10037,108 @@ javascript-detect-element-resize@^0.5.3:
   resolved "https://registry.yarnpkg.com/javascript-detect-element-resize/-/javascript-detect-element-resize-0.5.3.tgz#1a71cd51dfe565907f299012fe73a294104025de"
   integrity sha1-GnHNUd/lZZB/KZAS/nOilBBAJd4=
 
-jest-changed-files@^25.2.6:
-  version "25.2.6"
-  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-25.2.6.tgz#7d569cd6b265b1a84db3914db345d9c452f26b71"
-  integrity sha512-F7l2m5n55jFnJj4ItB9XbAlgO+6umgvz/mdK76BfTd2NGkvGf9x96hUXP/15a1K0k14QtVOoutwpRKl360msvg==
+jest-changed-files@^25.3.0:
+  version "25.3.0"
+  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-25.3.0.tgz#85d8de6f4bd13dafda9d7f1e3f2565fc0e183c78"
+  integrity sha512-eqd5hyLbUjIVvLlJ3vQ/MoPxsxfESVXG9gvU19XXjKzxr+dXmZIqCXiY0OiYaibwlHZBJl2Vebkc0ADEMzCXew==
   dependencies:
-    "@jest/types" "^25.2.6"
+    "@jest/types" "^25.3.0"
     execa "^3.2.0"
     throat "^5.0.0"
 
-jest-cli@^25.2.7:
-  version "25.2.7"
-  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-25.2.7.tgz#515b61fee402c397ffa8d570532f7b039c3159f4"
-  integrity sha512-OOAZwY4Jkd3r5WhVM5L3JeLNFaylvHUczMLxQDVLrrVyb1Cy+DNJ6MVsb5TLh6iBklB42m5TOP+IbOgKGGOtMw==
+jest-cli@^25.3.0:
+  version "25.3.0"
+  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-25.3.0.tgz#d9e11f5700cc5946583cf0d01a9bdebceed448d2"
+  integrity sha512-XpNQPlW1tzpP7RGG8dxpkRegYDuLjzSiENu92+CYM87nEbmEPb3b4+yo8xcsHOnj0AG7DUt9b3uG8LuHI3MDzw==
   dependencies:
-    "@jest/core" "^25.2.7"
-    "@jest/test-result" "^25.2.6"
-    "@jest/types" "^25.2.6"
+    "@jest/core" "^25.3.0"
+    "@jest/test-result" "^25.3.0"
+    "@jest/types" "^25.3.0"
     chalk "^3.0.0"
     exit "^0.1.2"
     import-local "^3.0.2"
     is-ci "^2.0.0"
-    jest-config "^25.2.7"
-    jest-util "^25.2.6"
-    jest-validate "^25.2.6"
+    jest-config "^25.3.0"
+    jest-util "^25.3.0"
+    jest-validate "^25.3.0"
     prompts "^2.0.1"
     realpath-native "^2.0.0"
     yargs "^15.3.1"
 
-jest-config@^25.2.7:
-  version "25.2.7"
-  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-25.2.7.tgz#a14e5b96575987ce913dd9fc20ac8cd4b35a8c29"
-  integrity sha512-rIdPPXR6XUxi+7xO4CbmXXkE6YWprvlKc4kg1SrkCL2YV5m/8MkHstq9gBZJ19Qoa3iz/GP+0sTG/PcIwkFojg==
+jest-config@^25.3.0:
+  version "25.3.0"
+  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-25.3.0.tgz#112b5e2f2e57dec4501dd2fe979044c06fb1317e"
+  integrity sha512-CmF1JnNWFmoCSPC4tnU52wnVBpuxHjilA40qH/03IHxIevkjUInSMwaDeE6ACfxMPTLidBGBCO3EbxvzPbo8wA==
   dependencies:
     "@babel/core" "^7.1.0"
-    "@jest/test-sequencer" "^25.2.7"
-    "@jest/types" "^25.2.6"
-    babel-jest "^25.2.6"
+    "@jest/test-sequencer" "^25.3.0"
+    "@jest/types" "^25.3.0"
+    babel-jest "^25.3.0"
     chalk "^3.0.0"
     deepmerge "^4.2.2"
     glob "^7.1.1"
-    jest-environment-jsdom "^25.2.6"
-    jest-environment-node "^25.2.6"
+    jest-environment-jsdom "^25.3.0"
+    jest-environment-node "^25.3.0"
     jest-get-type "^25.2.6"
-    jest-jasmine2 "^25.2.7"
+    jest-jasmine2 "^25.3.0"
     jest-regex-util "^25.2.6"
-    jest-resolve "^25.2.6"
-    jest-util "^25.2.6"
-    jest-validate "^25.2.6"
+    jest-resolve "^25.3.0"
+    jest-util "^25.3.0"
+    jest-validate "^25.3.0"
     micromatch "^4.0.2"
-    pretty-format "^25.2.6"
+    pretty-format "^25.3.0"
     realpath-native "^2.0.0"
 
-jest-diff@^25.2.6:
-  version "25.2.6"
-  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-25.2.6.tgz#a6d70a9ab74507715ea1092ac513d1ab81c1b5e7"
-  integrity sha512-KuadXImtRghTFga+/adnNrv9s61HudRMR7gVSbP35UKZdn4IK2/0N0PpGZIqtmllK9aUyye54I3nu28OYSnqOg==
+jest-diff@^25.3.0:
+  version "25.3.0"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-25.3.0.tgz#0d7d6f5d6171e5dacde9e05be47b3615e147c26f"
+  integrity sha512-vyvs6RPoVdiwARwY4kqFWd4PirPLm2dmmkNzKqo38uZOzJvLee87yzDjIZLmY1SjM3XR5DwsUH+cdQ12vgqi1w==
   dependencies:
     chalk "^3.0.0"
     diff-sequences "^25.2.6"
     jest-get-type "^25.2.6"
-    pretty-format "^25.2.6"
+    pretty-format "^25.3.0"
 
-jest-docblock@^25.2.6:
-  version "25.2.6"
-  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-25.2.6.tgz#4b09f1e7b7d6b3f39242ef3647ac7106770f722b"
-  integrity sha512-VAYrljEq0upq0oERfIaaNf28gC6p9gORndhHstCYF8NWGNQJnzoaU//S475IxfWMk4UjjVmS9rJKLe5Jjjbixw==
+jest-docblock@^25.3.0:
+  version "25.3.0"
+  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-25.3.0.tgz#8b777a27e3477cd77a168c05290c471a575623ef"
+  integrity sha512-aktF0kCar8+zxRHxQZwxMy70stc9R1mOmrLsT5VO3pIT0uzGRSDAXxSlz4NqQWpuLjPpuMhPRl7H+5FRsvIQAg==
   dependencies:
     detect-newline "^3.0.0"
 
-jest-each@^25.2.6:
-  version "25.2.6"
-  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-25.2.6.tgz#026f6dea2ccc443c35cea793265620aab1b278b6"
-  integrity sha512-OgQ01VINaRD6idWJOhCYwUc5EcgHBiFlJuw+ON2VgYr7HLtMFyCcuo+3mmBvuLUH4QudREZN7cDCZviknzsaJQ==
+jest-each@^25.3.0:
+  version "25.3.0"
+  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-25.3.0.tgz#a319eecf1f6076164ab86f99ca166a55b96c0bd4"
+  integrity sha512-aBfS4VOf/Qs95yUlX6d6WBv0szvOcTkTTyCIaLuQGj4bSHsT+Wd9dDngVHrCe5uytxpN8VM+NAloI6nbPjXfXw==
   dependencies:
-    "@jest/types" "^25.2.6"
+    "@jest/types" "^25.3.0"
     chalk "^3.0.0"
     jest-get-type "^25.2.6"
-    jest-util "^25.2.6"
-    pretty-format "^25.2.6"
+    jest-util "^25.3.0"
+    pretty-format "^25.3.0"
 
-jest-environment-jsdom@^25.2.6:
-  version "25.2.6"
-  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-25.2.6.tgz#b7ae41c6035905b8e58d63a8f63cf8eaa00af279"
-  integrity sha512-/o7MZIhGmLGIEG5j7r5B5Az0umWLCHU+F5crwfbm0BzC4ybHTJZOQTFQWhohBg+kbTCNOuftMcqHlVkVduJCQQ==
+jest-environment-jsdom@^25.3.0:
+  version "25.3.0"
+  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-25.3.0.tgz#c493ab8c41f28001520c70ef67dd88b88be6af05"
+  integrity sha512-jdE4bQN+k2QEZ9sWOxsqDJvMzbdFSCN/4tw8X0TQaCqyzKz58PyEf41oIr4WO7ERdp7WaJGBSUKF7imR3UW1lg==
   dependencies:
-    "@jest/environment" "^25.2.6"
-    "@jest/fake-timers" "^25.2.6"
-    "@jest/types" "^25.2.6"
-    jest-mock "^25.2.6"
-    jest-util "^25.2.6"
+    "@jest/environment" "^25.3.0"
+    "@jest/fake-timers" "^25.3.0"
+    "@jest/types" "^25.3.0"
+    jest-mock "^25.3.0"
+    jest-util "^25.3.0"
     jsdom "^15.2.1"
 
-jest-environment-node@^25.2.6:
-  version "25.2.6"
-  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-25.2.6.tgz#ad4398432867113f474d94fe37b071ed04b30f3d"
-  integrity sha512-D1Ihj14fxZiMHGeTtU/LunhzSI+UeBvlr/rcXMTNyRMUMSz2PEhuqGbB78brBY6Dk3FhJDk7Ta+8reVaGjLWhA==
+jest-environment-node@^25.3.0:
+  version "25.3.0"
+  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-25.3.0.tgz#9845f0e63991e8498448cb0ae804935689533db9"
+  integrity sha512-XO09S29Nx1NU7TiMPHMoDIkxoGBuKSTbE+sHp0gXbeLDXhIdhysUI25kOqFFSD9AuDgvPvxWCXrvNqiFsOH33g==
   dependencies:
-    "@jest/environment" "^25.2.6"
-    "@jest/fake-timers" "^25.2.6"
-    "@jest/types" "^25.2.6"
-    jest-mock "^25.2.6"
-    jest-util "^25.2.6"
+    "@jest/environment" "^25.3.0"
+    "@jest/fake-timers" "^25.3.0"
+    "@jest/types" "^25.3.0"
+    jest-mock "^25.3.0"
+    jest-util "^25.3.0"
     semver "^6.3.0"
 
 jest-get-type@^25.2.6:
@@ -10146,25 +10146,6 @@ jest-get-type@^25.2.6:
   resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-25.2.6.tgz#0b0a32fab8908b44d508be81681487dbabb8d877"
   integrity sha512-DxjtyzOHjObRM+sM1knti6or+eOgcGU4xVSb2HNP1TqO4ahsT+rqZg+nyqHWJSvWgKC5cG3QjGFBqxLghiF/Ig==
 
-jest-haste-map@^25.2.6:
-  version "25.2.6"
-  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-25.2.6.tgz#4aa6bcfa15310afccdb9ca77af58a98add8cedb8"
-  integrity sha512-nom0+fnY8jwzelSDQnrqaKAcDZczYQvMEwcBjeL3PQ4MlcsqeB7dmrsAniUw/9eLkngT5DE6FhnenypilQFsgA==
-  dependencies:
-    "@jest/types" "^25.2.6"
-    anymatch "^3.0.3"
-    fb-watchman "^2.0.0"
-    graceful-fs "^4.2.3"
-    jest-serializer "^25.2.6"
-    jest-util "^25.2.6"
-    jest-worker "^25.2.6"
-    micromatch "^4.0.2"
-    sane "^4.0.3"
-    walker "^1.0.7"
-    which "^2.0.2"
-  optionalDependencies:
-    fsevents "^2.1.2"
-
 jest-haste-map@^25.3.0:
   version "25.3.0"
   resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-25.3.0.tgz#b7683031c9c9ddc0521d311564108b244b11e4c6"
@@ -10184,66 +10165,66 @@ jest-haste-map@^25.3.0:
   optionalDependencies:
     fsevents "^2.1.2"
 
-jest-jasmine2@^25.2.7:
-  version "25.2.7"
-  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-25.2.7.tgz#55ff87f8f462ef0e2f16fd19430b8be8bcebef0e"
-  integrity sha512-HeQxEbonp8fUvik9jF0lkU9ab1u5TQdIb7YSU9Fj7SxWtqHNDGyCpF6ZZ3r/5yuertxi+R95Ba9eA91GMQ38eA==
+jest-jasmine2@^25.3.0:
+  version "25.3.0"
+  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-25.3.0.tgz#16ae4f68adef65fb45001b26c864bcbcbf972830"
+  integrity sha512-NCYOGE6+HNzYFSui52SefgpsnIzvxjn6KAgqw66BdRp37xpMD/4kujDHLNW5bS5i53os5TcMn6jYrzQRO8VPrQ==
   dependencies:
     "@babel/traverse" "^7.1.0"
-    "@jest/environment" "^25.2.6"
+    "@jest/environment" "^25.3.0"
     "@jest/source-map" "^25.2.6"
-    "@jest/test-result" "^25.2.6"
-    "@jest/types" "^25.2.6"
+    "@jest/test-result" "^25.3.0"
+    "@jest/types" "^25.3.0"
     chalk "^3.0.0"
     co "^4.6.0"
-    expect "^25.2.7"
+    expect "^25.3.0"
     is-generator-fn "^2.0.0"
-    jest-each "^25.2.6"
-    jest-matcher-utils "^25.2.7"
-    jest-message-util "^25.2.6"
-    jest-runtime "^25.2.7"
-    jest-snapshot "^25.2.7"
-    jest-util "^25.2.6"
-    pretty-format "^25.2.6"
+    jest-each "^25.3.0"
+    jest-matcher-utils "^25.3.0"
+    jest-message-util "^25.3.0"
+    jest-runtime "^25.3.0"
+    jest-snapshot "^25.3.0"
+    jest-util "^25.3.0"
+    pretty-format "^25.3.0"
     throat "^5.0.0"
 
-jest-leak-detector@^25.2.6:
-  version "25.2.6"
-  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-25.2.6.tgz#68fbaf651142292b03e30641f33e15af9b8c62b1"
-  integrity sha512-n+aJUM+j/x1kIaPVxzerMqhAUuqTU1PL5kup46rXh+l9SP8H6LqECT/qD1GrnylE1L463/0StSPkH4fUpkuEjA==
+jest-leak-detector@^25.3.0:
+  version "25.3.0"
+  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-25.3.0.tgz#5b6bf04903b35be56038915a55f47291771f769f"
+  integrity sha512-jk7k24dMIfk8LUSQQGN8PyOy9+J0NAfHZWiDmUDYVMctY8FLJQ1eQ8+PjMoN8PgwhLIggUqgYJnyRFvUz3jLRw==
   dependencies:
     jest-get-type "^25.2.6"
-    pretty-format "^25.2.6"
+    pretty-format "^25.3.0"
 
-jest-matcher-utils@^25.2.7:
-  version "25.2.7"
-  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-25.2.7.tgz#53fad3c11fc42e92e374306df543026712c957a3"
-  integrity sha512-jNYmKQPRyPO3ny0KY1I4f0XW4XnpJ3Nx5ovT4ik0TYDOYzuXJW40axqOyS61l/voWbVT9y9nZ1THL1DlpaBVpA==
+jest-matcher-utils@^25.3.0:
+  version "25.3.0"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-25.3.0.tgz#76765788a26edaa8bc5f0100aea52ae383559648"
+  integrity sha512-ZBUJ2fchNIZt+fyzkuCFBb8SKaU//Rln45augfUtbHaGyVxCO++ANARdBK9oPGXU3hEDgyy7UHnOP/qNOJXFUg==
   dependencies:
     chalk "^3.0.0"
-    jest-diff "^25.2.6"
+    jest-diff "^25.3.0"
     jest-get-type "^25.2.6"
-    pretty-format "^25.2.6"
+    pretty-format "^25.3.0"
 
-jest-message-util@^25.2.6:
-  version "25.2.6"
-  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-25.2.6.tgz#9d5523bebec8cd9cdef75f0f3069d6ec9a2252df"
-  integrity sha512-Hgg5HbOssSqOuj+xU1mi7m3Ti2nwSQJQf/kxEkrz2r2rp2ZLO1pMeKkz2WiDUWgSR+APstqz0uMFcE5yc0qdcg==
+jest-message-util@^25.3.0:
+  version "25.3.0"
+  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-25.3.0.tgz#e3836826fe5ca538a337b87d9bd2648190867f85"
+  integrity sha512-5QNy9Id4WxJbRITEbA1T1kem9bk7y2fD0updZMSTNHtbEDnYOGLDPAuFBhFgVmOZpv0n6OMdVkK+WhyXEPCcOw==
   dependencies:
     "@babel/code-frame" "^7.0.0"
-    "@jest/types" "^25.2.6"
+    "@jest/types" "^25.3.0"
     "@types/stack-utils" "^1.0.1"
     chalk "^3.0.0"
     micromatch "^4.0.2"
     slash "^3.0.0"
     stack-utils "^1.0.1"
 
-jest-mock@^25.2.6:
-  version "25.2.6"
-  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-25.2.6.tgz#8df66eaa55a713d0f2a7dfb4f14507289d24dfa3"
-  integrity sha512-vc4nibavi2RGPdj/MyZy/azuDjZhpYZLvpfgq1fxkhbyTpKVdG7CgmRVKJ7zgLpY5kuMjTzDYA6QnRwhsCU+tA==
+jest-mock@^25.3.0:
+  version "25.3.0"
+  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-25.3.0.tgz#d72644509e40987a732a9a2534a1054f4649402c"
+  integrity sha512-yRn6GbuqB4j3aYu+Z1ezwRiZfp0o9om5uOcBovVtkcRLeBCNP5mT0ysdenUsxAHnQUgGwPOE1wwhtQYe6NKirQ==
   dependencies:
-    "@jest/types" "^25.2.6"
+    "@jest/types" "^25.3.0"
 
 jest-pnp-resolver@^1.2.1:
   version "1.2.1"
@@ -10255,78 +10236,78 @@ jest-regex-util@^25.2.6:
   resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-25.2.6.tgz#d847d38ba15d2118d3b06390056028d0f2fd3964"
   integrity sha512-KQqf7a0NrtCkYmZZzodPftn7fL1cq3GQAFVMn5Hg8uKx/fIenLEobNanUxb7abQ1sjADHBseG/2FGpsv/wr+Qw==
 
-jest-resolve-dependencies@^25.2.7:
-  version "25.2.7"
-  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-25.2.7.tgz#9ca4c62d67cce031a27fa5d5705b4b5b5c029d23"
-  integrity sha512-IrnMzCAh11Xd2gAOJL+ThEW6QO8DyqNdvNkQcaCticDrOAr9wtKT7yT6QBFFjqKFgjjvaVKDs59WdgUhgYnHnQ==
+jest-resolve-dependencies@^25.3.0:
+  version "25.3.0"
+  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-25.3.0.tgz#b0e4ae053dd44ddacc18c6ee12b5b7c28e445a90"
+  integrity sha512-bDUlLYmHW+f7J7KgcY2lkq8EMRqKonRl0XoD4Wp5SJkgAxKJnsaIOlrrVNTfXYf+YOu3VCjm/Ac2hPF2nfsCIA==
   dependencies:
-    "@jest/types" "^25.2.6"
+    "@jest/types" "^25.3.0"
     jest-regex-util "^25.2.6"
-    jest-snapshot "^25.2.7"
+    jest-snapshot "^25.3.0"
 
-jest-resolve@^25.2.6:
-  version "25.2.6"
-  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-25.2.6.tgz#84694ead5da13c2890ac04d4a78699ba937f3896"
-  integrity sha512-7O61GVdcAXkLz/vNGKdF+00A80/fKEAA47AEXVNcZwj75vEjPfZbXDaWFmAQCyXj4oo9y9dC9D+CLA11t8ieGw==
+jest-resolve@^25.3.0:
+  version "25.3.0"
+  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-25.3.0.tgz#cb90a5bbea54a02eccdbbf4126a819595dcf91d6"
+  integrity sha512-IHoQAAybulsJ+ZgWis+ekYKDAoFkVH5Nx/znpb41zRtpxj4fr2WNV9iDqavdSm8GIpMlsfZxbC/fV9DhW0q9VQ==
   dependencies:
-    "@jest/types" "^25.2.6"
+    "@jest/types" "^25.3.0"
     browser-resolve "^1.11.3"
     chalk "^3.0.0"
     jest-pnp-resolver "^1.2.1"
     realpath-native "^2.0.0"
     resolve "^1.15.1"
 
-jest-runner@^25.2.7:
-  version "25.2.7"
-  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-25.2.7.tgz#3676c01dc0104caa8a0ebb8507df382c88f2a1e2"
-  integrity sha512-RFEr71nMrtNwcpoHzie5+fe1w3JQCGMyT2xzNwKe3f88+bK+frM2o1v24gEcPxQ2QqB3COMCe2+1EkElP+qqqQ==
+jest-runner@^25.3.0:
+  version "25.3.0"
+  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-25.3.0.tgz#673ef2ac79d2810eb6b2c1a3f82398375a3d1174"
+  integrity sha512-csDqSC9qGHYWDrzrElzEgFbteztFeZJmKhSgY5jlCIcN0+PhActzRNku0DA1Xa1HxGOb0/AfbP1EGJlP4fGPtA==
   dependencies:
-    "@jest/console" "^25.2.6"
-    "@jest/environment" "^25.2.6"
-    "@jest/test-result" "^25.2.6"
-    "@jest/types" "^25.2.6"
+    "@jest/console" "^25.3.0"
+    "@jest/environment" "^25.3.0"
+    "@jest/test-result" "^25.3.0"
+    "@jest/types" "^25.3.0"
     chalk "^3.0.0"
     exit "^0.1.2"
     graceful-fs "^4.2.3"
-    jest-config "^25.2.7"
-    jest-docblock "^25.2.6"
-    jest-haste-map "^25.2.6"
-    jest-jasmine2 "^25.2.7"
-    jest-leak-detector "^25.2.6"
-    jest-message-util "^25.2.6"
-    jest-resolve "^25.2.6"
-    jest-runtime "^25.2.7"
-    jest-util "^25.2.6"
+    jest-config "^25.3.0"
+    jest-docblock "^25.3.0"
+    jest-haste-map "^25.3.0"
+    jest-jasmine2 "^25.3.0"
+    jest-leak-detector "^25.3.0"
+    jest-message-util "^25.3.0"
+    jest-resolve "^25.3.0"
+    jest-runtime "^25.3.0"
+    jest-util "^25.3.0"
     jest-worker "^25.2.6"
     source-map-support "^0.5.6"
     throat "^5.0.0"
 
-jest-runtime@^25.2.7:
-  version "25.2.7"
-  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-25.2.7.tgz#cb10e695d036671a83aec3a3803163c354043ac9"
-  integrity sha512-Gw3X8KxTTFylu2T/iDSNKRUQXQiPIYUY0b66GwVYa7W8wySkUljKhibQHSq0VhmCAN7vRBEQjlVQ+NFGNmQeBw==
+jest-runtime@^25.3.0:
+  version "25.3.0"
+  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-25.3.0.tgz#af4d40dbcc590fa5de9910cb6a120a13d131050b"
+  integrity sha512-gn5KYB1wxXRM3nfw8fVpthFu60vxQUCr+ShGq41+ZBFF3DRHZRKj3HDWVAVB4iTNBj2y04QeAo5cZ/boYaPg0w==
   dependencies:
-    "@jest/console" "^25.2.6"
-    "@jest/environment" "^25.2.6"
+    "@jest/console" "^25.3.0"
+    "@jest/environment" "^25.3.0"
     "@jest/source-map" "^25.2.6"
-    "@jest/test-result" "^25.2.6"
-    "@jest/transform" "^25.2.6"
-    "@jest/types" "^25.2.6"
+    "@jest/test-result" "^25.3.0"
+    "@jest/transform" "^25.3.0"
+    "@jest/types" "^25.3.0"
     "@types/yargs" "^15.0.0"
     chalk "^3.0.0"
     collect-v8-coverage "^1.0.0"
     exit "^0.1.2"
     glob "^7.1.3"
     graceful-fs "^4.2.3"
-    jest-config "^25.2.7"
-    jest-haste-map "^25.2.6"
-    jest-message-util "^25.2.6"
-    jest-mock "^25.2.6"
+    jest-config "^25.3.0"
+    jest-haste-map "^25.3.0"
+    jest-message-util "^25.3.0"
+    jest-mock "^25.3.0"
     jest-regex-util "^25.2.6"
-    jest-resolve "^25.2.6"
-    jest-snapshot "^25.2.7"
-    jest-util "^25.2.6"
-    jest-validate "^25.2.6"
+    jest-resolve "^25.3.0"
+    jest-snapshot "^25.3.0"
+    jest-util "^25.3.0"
+    jest-validate "^25.3.0"
     realpath-native "^2.0.0"
     slash "^3.0.0"
     strip-bom "^4.0.0"
@@ -10337,36 +10318,26 @@ jest-serializer@^25.2.6:
   resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-25.2.6.tgz#3bb4cc14fe0d8358489dbbefbb8a4e708ce039b7"
   integrity sha512-RMVCfZsezQS2Ww4kB5HJTMaMJ0asmC0BHlnobQC6yEtxiFKIxohFA4QSXSabKwSggaNkqxn6Z2VwdFCjhUWuiQ==
 
-jest-snapshot@^25.2.7:
-  version "25.2.7"
-  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-25.2.7.tgz#7eeafeef4dcbda1c47c8503d2bf5212b6430aac6"
-  integrity sha512-Rm8k7xpGM4tzmYhB6IeRjsOMkXaU8/FOz5XlU6oYwhy53mq6txVNqIKqN1VSiexzpC80oWVxVDfUDt71M6XPOA==
+jest-snapshot@^25.3.0:
+  version "25.3.0"
+  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-25.3.0.tgz#d4feb457494f4aaedcc83fbbf1ca21808fc3df71"
+  integrity sha512-GGpR6Oro2htJPKh5RX4PR1xwo5jCEjtvSPLW1IS7N85y+2bWKbiknHpJJRKSdGXghElb5hWaeQASJI4IiRayGg==
   dependencies:
     "@babel/types" "^7.0.0"
-    "@jest/types" "^25.2.6"
+    "@jest/types" "^25.3.0"
     "@types/prettier" "^1.19.0"
     chalk "^3.0.0"
-    expect "^25.2.7"
-    jest-diff "^25.2.6"
+    expect "^25.3.0"
+    jest-diff "^25.3.0"
     jest-get-type "^25.2.6"
-    jest-matcher-utils "^25.2.7"
-    jest-message-util "^25.2.6"
-    jest-resolve "^25.2.6"
+    jest-matcher-utils "^25.3.0"
+    jest-message-util "^25.3.0"
+    jest-resolve "^25.3.0"
     make-dir "^3.0.0"
     natural-compare "^1.4.0"
-    pretty-format "^25.2.6"
+    pretty-format "^25.3.0"
     semver "^6.3.0"
 
-jest-util@^25.2.6:
-  version "25.2.6"
-  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-25.2.6.tgz#3c1c95cdfd653126728b0ed861a86610e30d569c"
-  integrity sha512-gpXy0H5ymuQ0x2qgl1zzHg7LYHZYUmDEq6F7lhHA8M0eIwDB2WteOcCnQsohl9c/vBKZ3JF2r4EseipCZz3s4Q==
-  dependencies:
-    "@jest/types" "^25.2.6"
-    chalk "^3.0.0"
-    is-ci "^2.0.0"
-    make-dir "^3.0.0"
-
 jest-util@^25.3.0:
   version "25.3.0"
   resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-25.3.0.tgz#e3b0064165818f10d78514696fd25efba82cf049"
@@ -10377,28 +10348,28 @@ jest-util@^25.3.0:
     is-ci "^2.0.0"
     make-dir "^3.0.0"
 
-jest-validate@^25.2.6:
-  version "25.2.6"
-  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-25.2.6.tgz#ab3631fb97e242c42b09ca53127abe0b12e9125e"
-  integrity sha512-a4GN7hYbqQ3Rt9iHsNLFqQz7HDV7KiRPCwPgo5nqtTIWNZw7gnT8KchG+Riwh+UTSn8REjFCodGp50KX/fRNgQ==
+jest-validate@^25.3.0:
+  version "25.3.0"
+  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-25.3.0.tgz#eb95fdee0039647bcd5d4be641b21e4a142a880c"
+  integrity sha512-3WuXgIZ4HXUvW6gk9twFFkT9j6zUorKnF2oEY8VEsHb7x5LGvVlN3WUsbqazVKuyXwvikO2zFJ/YTySMsMje2w==
   dependencies:
-    "@jest/types" "^25.2.6"
+    "@jest/types" "^25.3.0"
     camelcase "^5.3.1"
     chalk "^3.0.0"
     jest-get-type "^25.2.6"
     leven "^3.1.0"
-    pretty-format "^25.2.6"
+    pretty-format "^25.3.0"
 
-jest-watcher@^25.2.7:
-  version "25.2.7"
-  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-25.2.7.tgz#01db4332d34d14c03c9ef22255125a3b07f997bc"
-  integrity sha512-RdHuW+f49tahWtluTnUdZ2iPliebleROI2L/J5phYrUS6DPC9RB3SuUtqYyYhGZJsbvRSuLMIlY/cICJ+PIecw==
+jest-watcher@^25.3.0:
+  version "25.3.0"
+  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-25.3.0.tgz#fd03fd5ca52f02bd3161ab177466bf1bfdd34e5c"
+  integrity sha512-dtFkfidFCS9Ucv8azOg2hkiY3sgJEHeTLtGFHS+jfBEE7eRtrO6+2r1BokyDkaG2FOD7485r/SgpC1MFAENfeA==
   dependencies:
-    "@jest/test-result" "^25.2.6"
-    "@jest/types" "^25.2.6"
+    "@jest/test-result" "^25.3.0"
+    "@jest/types" "^25.3.0"
     ansi-escapes "^4.2.1"
     chalk "^3.0.0"
-    jest-util "^25.2.6"
+    jest-util "^25.3.0"
     string-length "^3.1.0"
 
 jest-worker@^24.9.0:
@@ -10425,14 +10396,14 @@ jest-worker@^25.2.6:
     merge-stream "^2.0.0"
     supports-color "^7.0.0"
 
-jest@~25.2.7:
-  version "25.2.7"
-  resolved "https://registry.yarnpkg.com/jest/-/jest-25.2.7.tgz#3929a5f35cdd496f7756876a206b99a94e1e09ae"
-  integrity sha512-XV1n/CE2McCikl4tfpCY950RytHYvxdo/wvtgmn/qwA8z1s16fuvgFL/KoPrrmkqJTaPMUlLVE58pwiaTX5TdA==
+jest@~25.3.0:
+  version "25.3.0"
+  resolved "https://registry.yarnpkg.com/jest/-/jest-25.3.0.tgz#7a5e59741d94b8662664c77a9f346246d6bf228b"
+  integrity sha512-iKd5ShQSHzFT5IL/6h5RZJhApgqXSoPxhp5HEi94v6OAw9QkF8T7X+liEU2eEHJ1eMFYTHmeWLrpBWulsDpaUg==
   dependencies:
-    "@jest/core" "^25.2.7"
+    "@jest/core" "^25.3.0"
     import-local "^3.0.2"
-    jest-cli "^25.2.7"
+    jest-cli "^25.3.0"
 
 jimp-compact@^0.8.0:
   version "0.8.4"
@@ -13429,12 +13400,12 @@ pretty-error@^2.0.2, pretty-error@^2.1.1:
     renderkid "^2.0.1"
     utila "~0.4"
 
-pretty-format@^25.2.6:
-  version "25.2.6"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-25.2.6.tgz#542a1c418d019bbf1cca2e3620443bc1323cb8d7"
-  integrity sha512-DEiWxLBaCHneffrIT4B+TpMvkV9RNvvJrd3lY9ew1CEQobDzEXmYT1mg0hJhljZty7kCc10z13ohOFAE8jrUDg==
+pretty-format@^25.3.0:
+  version "25.3.0"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-25.3.0.tgz#d0a4f988ff4a6cd350342fdabbb809aeb4d49ad5"
+  integrity sha512-wToHwF8bkQknIcFkBqNfKu4+UZqnrLn/Vr+wwKQwwvPzkBfDDKp/qIabFqdgtoi5PEnM8LFByVsOrHoa3SpTVA==
   dependencies:
-    "@jest/types" "^25.2.6"
+    "@jest/types" "^25.3.0"
     ansi-regex "^5.0.0"
     ansi-styles "^4.0.0"
     react-is "^16.12.0"

From 38233da6d0087278550549f02b916c8faf46837e Mon Sep 17 00:00:00 2001
From: Raphael Beer <raphael.beer@protonmail.com>
Date: Thu, 9 Apr 2020 23:01:54 +0200
Subject: [PATCH 41/54] review: apply suggestions

Co-Authored-By: Alina Beck <alina.beck@mail.com>
---
 webapp/components/features/FollowList/FollowList.vue | 10 +++++++---
 webapp/plugins/vue-directives.js                     |  8 ++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/webapp/components/features/FollowList/FollowList.vue b/webapp/components/features/FollowList/FollowList.vue
index 6199ad95c..a5ed02713 100644
--- a/webapp/components/features/FollowList/FollowList.vue
+++ b/webapp/components/features/FollowList/FollowList.vue
@@ -143,8 +143,12 @@ export default {
     color: $text-color-soft;
   }
 
-  .spacer-x-small {
-    margin: $space-x-small 0;
-  }
+> :nth-child(n):not(:last-child) {
+    margin-bottom: $space-small;
+}
+
+.user-teaser {
+    margin-bottom: $space-x-small;
+}
 }
 </style>
diff --git a/webapp/plugins/vue-directives.js b/webapp/plugins/vue-directives.js
index 43daed57e..d41f35a0e 100644
--- a/webapp/plugins/vue-directives.js
+++ b/webapp/plugins/vue-directives.js
@@ -7,12 +7,8 @@ export default ({ app }) => {
       // Focus the element
       Vue.nextTick(() => {
         if (binding.value !== false) {
-          let target = el
-          const isInput = target instanceof HTMLInputElement
-          if (!isInput) {
-            target = el.querySelector('input')
-          }
-          if (target && typeof target.focus === 'function') {
+          const target = el instanceof HTMLInputElement ? el : el.querySelector('input')
+          if (target) {
             target.focus()
           }
         }

From 7ff9d617d6c3c27a86c187603e1bb7093a62b723 Mon Sep 17 00:00:00 2001
From: Raphael Beer <raphael.beer@protonmail.com>
Date: Thu, 9 Apr 2020 22:38:50 +0200
Subject: [PATCH 42/54] Review: remove showing both types in stories

---
 .../features/FollowList/FollowList.story.js   | 39 +++++++------------
 1 file changed, 13 insertions(+), 26 deletions(-)

diff --git a/webapp/components/features/FollowList/FollowList.story.js b/webapp/components/features/FollowList/FollowList.story.js
index efdbaed3b..b7f093854 100644
--- a/webapp/components/features/FollowList/FollowList.story.js
+++ b/webapp/components/features/FollowList/FollowList.story.js
@@ -18,6 +18,14 @@ const user = {
   following: helpers.fakeUser(7),
 }
 
+const lessThanSevenUser = {
+  ...user,
+  followedByCount: 3,
+  followedBy: user.followedBy.slice(0, 3),
+  followingCount: 3,
+  following: user.following.slice(0, 3),
+}
+
 const allConnectionsUser = {
   ...user,
   followedBy: [...user.followedBy, ...helpers.fakeUser(5)],
@@ -32,12 +40,6 @@ const noConnectionsUser = {
   followingCount: 0,
 }
 
-const wrapTemplates = (templates) => `
-<div style="display: flex; flex-wrap: wrap;">
-${templates.map((template) => `<div style="margin: 8px;">${template}</div>`).join('')}
-</div>
-`
-
 storiesOf('FollowList', module)
   .addDecorator(withA11y)
   .addDecorator(helpers.layout)
@@ -48,10 +50,7 @@ storiesOf('FollowList', module)
       data() {
         return { user: noConnectionsUser }
       },
-      template: wrapTemplates([
-        '<follow-list :user="user" />',
-        '<follow-list :user="user" type="followedBy" />',
-      ]),
+      template: '<follow-list :user="user" type="following" />',
     }
   })
   .add('with up to 7 connections', () => {
@@ -67,10 +66,7 @@ storiesOf('FollowList', module)
           action('fetchAllConnections')(type, this.user)
         },
       },
-      template: wrapTemplates([
-        '<follow-list :user="user" @fetchAllConnections="fetchAllConnections"/>',
-        '<follow-list :user="user" type="followedBy" @fetchAllConnections="fetchAllConnections"/>',
-      ]),
+      template: '<follow-list :user="user" @fetchAllConnections="fetchAllConnections"/>',
     }
   })
 
@@ -81,10 +77,7 @@ storiesOf('FollowList', module)
       data() {
         return { user: allConnectionsUser }
       },
-      template: wrapTemplates([
-        '<follow-list :user="user" />',
-        '<follow-list :user="user" type="followedBy"/>',
-      ]),
+      template: '<follow-list :user="user" />',
     }
   })
   .add('with a lot of connections', () => {
@@ -102,10 +95,7 @@ storiesOf('FollowList', module)
           },
         }
       },
-      template: wrapTemplates([
-        '<follow-list :user="user" />',
-        '<follow-list :user="user" type="followedBy"/>',
-      ]),
+      template: '<follow-list :user="user" />',
     }
   })
   .add('Fuzzy Filter', () => {
@@ -115,9 +105,6 @@ storiesOf('FollowList', module)
       data() {
         return { user: fuzzyFilterUser }
       },
-      template: wrapTemplates([
-        '<follow-list :user="user" />',
-        '<follow-list :user="user" type="followedBy">',
-      ]),
+      template: '<follow-list :user="user" />',
     }
   })

From 2c7ca87acc12c20198fcdda450d7f53aa1c4a0ca Mon Sep 17 00:00:00 2001
From: Raphael Beer <raphael.beer@protonmail.com>
Date: Thu, 9 Apr 2020 23:14:16 +0200
Subject: [PATCH 43/54] Review: lint

---
 webapp/pages/profile/_id/_slug.vue | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/webapp/pages/profile/_id/_slug.vue b/webapp/pages/profile/_id/_slug.vue
index 36ef1ba10..1a43da14b 100644
--- a/webapp/pages/profile/_id/_slug.vue
+++ b/webapp/pages/profile/_id/_slug.vue
@@ -90,17 +90,17 @@
           {{ $t('profile.network.title') }}
         </ds-heading>
         <follow-list
+          :loading="$apollo.loading"
           :user="user"
           type="followedBy"
           @fetchAllConnections="fetchAllConnections"
-          :loading="$apollo.loading"
         />
         <ds-space />
         <follow-list
+          :loading="$apollo.loading"
           :user="user"
           type="following"
           @fetchAllConnections="fetchAllConnections"
-          :loading="$apollo.loading"
         />
         <ds-space v-if="user.socialMedia && user.socialMedia.length" margin="large">
           <base-card style="position: relative; height: auto;">
@@ -270,7 +270,6 @@ export default {
     mode: 'out-in',
   },
   data() {
-    console.log('component data()')
     const filter = tabToFilterMapping({ tab: 'post', id: this.$route.params.id })
     return {
       User: [],
@@ -434,7 +433,8 @@ export default {
       this.user.followedBy = followedBy
     },
     fetchAllConnections(type) {
-      this[`${type}Count`] = Infinity
+      if (type === 'following') this.followingCount = Infinity
+      if (type === 'followedBy') this.followedByCount = Infinity
     },
   },
   apollo: {
@@ -462,8 +462,8 @@ export default {
       variables() {
         return {
           id: this.$route.params.id,
-          followedByCount: this.followedByCount, 
-          followingCount: this.followingCount
+          followedByCount: this.followedByCount,
+          followingCount: this.followingCount,
         }
       },
       fetchPolicy: 'cache-and-network',

From b3f1137006c066afd05d4d9220c0104374b3d439 Mon Sep 17 00:00:00 2001
From: Raphael Beer <raphael.beer@protonmail.com>
Date: Thu, 9 Apr 2020 23:39:47 +0200
Subject: [PATCH 44/54] Review: fix styles

---
 webapp/assets/_new/styles/tokens.scss         |  1 +
 .../features/FollowList/FollowList.vue        | 21 ++++++++++---------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/webapp/assets/_new/styles/tokens.scss b/webapp/assets/_new/styles/tokens.scss
index 9e86b3c70..c4738f8ac 100644
--- a/webapp/assets/_new/styles/tokens.scss
+++ b/webapp/assets/_new/styles/tokens.scss
@@ -240,6 +240,7 @@ $size-height-base: 42px;
 $size-height-large: 50px;
 $size-height-xlarge: 60px;
 $size-height-footer: 64px;
+$size-height-connections: 300px;
 $size-tappable-square: 44px;
 $size-ribbon: 6px;
 
diff --git a/webapp/components/features/FollowList/FollowList.vue b/webapp/components/features/FollowList/FollowList.vue
index a5ed02713..3f5791438 100644
--- a/webapp/components/features/FollowList/FollowList.vue
+++ b/webapp/components/features/FollowList/FollowList.vue
@@ -124,18 +124,19 @@ export default {
   display: flex;
   flex-direction: column;
   position: relative;
-  //max-height: ($size-avatar-small + $space-x-small * 2) * 8;
   width: auto;
 
   > .title {
     color: $text-color-soft;
-    font-size: $font-size-small + 0.03rem;
+    font-size: $font-size-base;
   }
 
-  .connections.--overflow {
-    height: ($size-avatar-base + $space-x-small * 2) * 5;
-    margin-top: -$space-x-small;
-    overflow-y: auto;
+  .connections {
+    height: $size-height-connections;
+
+    &.--overflow {
+      overflow-y: auto;
+    }
   }
 
   .nobody-message {
@@ -143,12 +144,12 @@ export default {
     color: $text-color-soft;
   }
 
-> :nth-child(n):not(:last-child) {
+  > :nth-child(n):not(:last-child) {
     margin-bottom: $space-small;
-}
+  }
 
-.user-teaser {
+  .user-teaser {
     margin-bottom: $space-x-small;
-}
+  }
 }
 </style>

From e018e2ead93d0fb7044f6a3ca7e679be5c3f597c Mon Sep 17 00:00:00 2001
From: Raphael Beer <raphael.beer@protonmail.com>
Date: Thu, 9 Apr 2020 23:52:12 +0200
Subject: [PATCH 45/54] Review: add hasMore() computed value +

  Replacing varying conditions for same
  logic with computed value `hasMore`.
---
 webapp/components/features/FollowList/FollowList.vue | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/webapp/components/features/FollowList/FollowList.vue b/webapp/components/features/FollowList/FollowList.vue
index 3f5791438..be8c35e1a 100644
--- a/webapp/components/features/FollowList/FollowList.vue
+++ b/webapp/components/features/FollowList/FollowList.vue
@@ -13,7 +13,7 @@
         />
       </div>
       <base-button
-        v-if="allConnectionsCount - connections.length"
+        v-if="hasMore"
         :loading="loading"
         class="spacer-x-small"
         size="small"
@@ -26,7 +26,7 @@
         }}
       </base-button>
       <ds-input
-        v-if="connections.length > 7"
+        v-if="!hasMore"
         v-focus="true"
         :name="`${type}Filter`"
         :placeholder="filter"
@@ -70,9 +70,11 @@ export default {
     connections() {
       return this.user[this.type]
     },
+    hasMore() {
+      return this.allConnectionsCount > this.connections.length
+    },
     connectionsClass() {
-      const overflow = this.connections.length > 7 ? ' --overflow' : ''
-      return `connections${overflow}`
+      return `connections${this.hasMore ? '' : ' --overflow'}`
     },
     filteredConnections() {
       if (!this.filter) {

From 30f66c3e14c4eb67d0834b8afd27f63347fb9e0d Mon Sep 17 00:00:00 2001
From: Raphael Beer <raphael.beer@protonmail.com>
Date: Fri, 10 Apr 2020 00:21:31 +0200
Subject: [PATCH 46/54] Review: storybook

---
 .../features/FollowList/FollowList.story.js   | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/webapp/components/features/FollowList/FollowList.story.js b/webapp/components/features/FollowList/FollowList.story.js
index b7f093854..78d895fe9 100644
--- a/webapp/components/features/FollowList/FollowList.story.js
+++ b/webapp/components/features/FollowList/FollowList.story.js
@@ -53,7 +53,19 @@ storiesOf('FollowList', module)
       template: '<follow-list :user="user" type="following" />',
     }
   })
-  .add('with up to 7 connections', () => {
+  .add('with all connections loaded', () => {
+    return {
+      components: { FollowList },
+      store: helpers.store,
+      data() {
+        return { user: lessThanSevenUser }
+      },
+
+      template: '<follow-list :user="user"/>',
+    }
+  })
+
+  .add('with more connections loadable', () => {
     return {
       components: { FollowList },
       store: helpers.store,
@@ -69,18 +81,7 @@ storiesOf('FollowList', module)
       template: '<follow-list :user="user" @fetchAllConnections="fetchAllConnections"/>',
     }
   })
-
-  .add('with all connections', () => {
-    return {
-      components: { FollowList },
-      store: helpers.store,
-      data() {
-        return { user: allConnectionsUser }
-      },
-      template: '<follow-list :user="user" />',
-    }
-  })
-  .add('with a lot of connections', () => {
+  .add('with 1000 connections loaded', () => {
     return {
       components: { FollowList },
       store: helpers.store,

From 15271a9f89b5d5990ade5667fc517db85aaa0a15 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 10 Apr 2020 04:15:37 +0000
Subject: [PATCH 47/54] build(deps-dev): bump date-fns from 2.11.1 to 2.12.0

Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.11.1 to 2.12.0.
- [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.11.1...v2.12.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 452e9ab6d..fa3b5248c 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "cypress-cucumber-preprocessor": "^2.2.1",
     "cypress-file-upload": "^3.5.3",
     "cypress-plugin-retries": "^1.5.2",
-    "date-fns": "^2.11.1",
+    "date-fns": "^2.12.0",
     "dotenv": "^8.2.0",
     "expect": "^25.3.0",
     "faker": "Marak/faker.js#master",
diff --git a/yarn.lock b/yarn.lock
index 247f8bf99..2fb632e3d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2639,10 +2639,10 @@ date-fns@^1.27.2:
   resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.30.1.tgz#2e71bf0b119153dbb4cc4e88d9ea5acfb50dc05c"
   integrity sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw==
 
-date-fns@^2.11.1:
-  version "2.11.1"
-  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.11.1.tgz#197b8be1bbf5c5e6fe8bea817f0fe111820e7a12"
-  integrity sha512-3RdUoinZ43URd2MJcquzBbDQo+J87cSzB8NkXdZiN5ia1UNyep0oCyitfiL88+R7clGTeq/RniXAc16gWyAu1w==
+date-fns@^2.12.0:
+  version "2.12.0"
+  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.12.0.tgz#01754c8a2f3368fc1119cf4625c3dad8c1845ee6"
+  integrity sha512-qJgn99xxKnFgB1qL4jpxU7Q2t0LOn1p8KMIveef3UZD7kqjT3tpFNNdXJelEHhE+rUgffriXriw/sOSU+cS1Hw==
 
 date-now@^0.1.4:
   version "0.1.4"

From 10e2ed180010e40ba83169cf5b40b1bbfb28ddb4 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 10 Apr 2020 04:18:51 +0000
Subject: [PATCH 48/54] build(deps): bump apollo-link-http from 1.5.16 to
 1.5.17 in /backend

Bumps [apollo-link-http](https://github.com/apollographql/apollo-link) from 1.5.16 to 1.5.17.
- [Release notes](https://github.com/apollographql/apollo-link/releases)
- [Changelog](https://github.com/apollographql/apollo-link/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-link/compare/apollo-link-http@1.5.16...apollo-link-http@1.5.17)

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

diff --git a/backend/package.json b/backend/package.json
index 5e7573c62..0a1fd20b3 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -42,7 +42,7 @@
     "apollo-cache-inmemory": "~1.6.5",
     "apollo-client": "~2.6.8",
     "apollo-link-context": "~1.0.19",
-    "apollo-link-http": "~1.5.16",
+    "apollo-link-http": "~1.5.17",
     "apollo-server": "~2.11.0",
     "apollo-server-express": "^2.12.0",
     "aws-sdk": "^2.652.0",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index cc38c02e7..f2ad5b228 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -2024,33 +2024,33 @@ apollo-link-context@~1.0.19:
     apollo-link "^1.2.13"
     tslib "^1.9.3"
 
-apollo-link-http-common@^0.2.15:
-  version "0.2.15"
-  resolved "https://registry.yarnpkg.com/apollo-link-http-common/-/apollo-link-http-common-0.2.15.tgz#304e67705122bf69a9abaded4351b10bc5efd6d9"
-  integrity sha512-+Heey4S2IPsPyTf8Ag3PugUupASJMW894iVps6hXbvwtg1aHSNMXUYO5VG7iRHkPzqpuzT4HMBanCTXPjtGzxg==
+apollo-link-http-common@^0.2.15, apollo-link-http-common@^0.2.16:
+  version "0.2.16"
+  resolved "https://registry.yarnpkg.com/apollo-link-http-common/-/apollo-link-http-common-0.2.16.tgz#756749dafc732792c8ca0923f9a40564b7c59ecc"
+  integrity sha512-2tIhOIrnaF4UbQHf7kjeQA/EmSorB7+HyJIIrUjJOKBgnXwuexi8aMecRlqTIDWcyVXCeqLhUnztMa6bOH/jTg==
   dependencies:
-    apollo-link "^1.2.13"
+    apollo-link "^1.2.14"
     ts-invariant "^0.4.0"
     tslib "^1.9.3"
 
-apollo-link-http@~1.5.16:
-  version "1.5.16"
-  resolved "https://registry.yarnpkg.com/apollo-link-http/-/apollo-link-http-1.5.16.tgz#44fe760bcc2803b8a7f57fc9269173afb00f3814"
-  integrity sha512-IA3xA/OcrOzINRZEECI6IdhRp/Twom5X5L9jMehfzEo2AXdeRwAMlH5LuvTZHgKD8V1MBnXdM6YXawXkTDSmJw==
+apollo-link-http@~1.5.17:
+  version "1.5.17"
+  resolved "https://registry.yarnpkg.com/apollo-link-http/-/apollo-link-http-1.5.17.tgz#499e9f1711bf694497f02c51af12d82de5d8d8ba"
+  integrity sha512-uWcqAotbwDEU/9+Dm9e1/clO7hTB2kQ/94JYcGouBVLjoKmTeJTUPQKcJGpPwUjZcSqgYicbFqQSoJIW0yrFvg==
   dependencies:
-    apollo-link "^1.2.13"
-    apollo-link-http-common "^0.2.15"
+    apollo-link "^1.2.14"
+    apollo-link-http-common "^0.2.16"
     tslib "^1.9.3"
 
-apollo-link@^1.0.0, apollo-link@^1.2.13, apollo-link@^1.2.3:
-  version "1.2.13"
-  resolved "https://registry.yarnpkg.com/apollo-link/-/apollo-link-1.2.13.tgz#dff00fbf19dfcd90fddbc14b6a3f9a771acac6c4"
-  integrity sha512-+iBMcYeevMm1JpYgwDEIDt/y0BB7VWyvlm/7x+TIPNLHCTCMgcEgDuW5kH86iQZWo0I7mNwQiTOz+/3ShPFmBw==
+apollo-link@^1.0.0, apollo-link@^1.2.13, apollo-link@^1.2.14, apollo-link@^1.2.3:
+  version "1.2.14"
+  resolved "https://registry.yarnpkg.com/apollo-link/-/apollo-link-1.2.14.tgz#3feda4b47f9ebba7f4160bef8b977ba725b684d9"
+  integrity sha512-p67CMEFP7kOG1JZ0ZkYZwRDa369w5PIjtMjvrQd/HnIV8FRsHRqLqK+oAZQnFa1DDdZtOtHTi+aMIW6EatC2jg==
   dependencies:
     apollo-utilities "^1.3.0"
     ts-invariant "^0.4.0"
     tslib "^1.9.3"
-    zen-observable-ts "^0.8.20"
+    zen-observable-ts "^0.8.21"
 
 apollo-server-caching@^0.5.1:
   version "0.5.1"
@@ -9778,10 +9778,10 @@ yup@^0.28.3:
     synchronous-promise "^2.0.10"
     toposort "^2.0.2"
 
-zen-observable-ts@^0.8.20:
-  version "0.8.20"
-  resolved "https://registry.yarnpkg.com/zen-observable-ts/-/zen-observable-ts-0.8.20.tgz#44091e335d3fcbc97f6497e63e7f57d5b516b163"
-  integrity sha512-2rkjiPALhOtRaDX6pWyNqK1fnP5KkJJybYebopNSn6wDG1lxBoFs2+nwwXKoA6glHIrtwrfBBy6da0stkKtTAA==
+zen-observable-ts@^0.8.21:
+  version "0.8.21"
+  resolved "https://registry.yarnpkg.com/zen-observable-ts/-/zen-observable-ts-0.8.21.tgz#85d0031fbbde1eba3cd07d3ba90da241215f421d"
+  integrity sha512-Yj3yXweRc8LdRMrCC8nIc4kkjWecPAUVh0TI0OUrWXx6aX790vLcDlWca6I4vsyCGH3LpWxq0dJRcMOFoVqmeg==
   dependencies:
     tslib "^1.9.3"
     zen-observable "^0.8.0"

From b9aaafa01c6589ea25459ea5c13c7d9ba56a0735 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 10 Apr 2020 04:25:39 +0000
Subject: [PATCH 49/54] build(deps): bump date-fns from 2.11.1 to 2.12.0 in
 /webapp

Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.11.1 to 2.12.0.
- [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.11.1...v2.12.0)

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 905d0a864..7eab8da16 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -71,7 +71,7 @@
     "cookie-universal-nuxt": "~2.1.3",
     "cropperjs": "^1.5.5",
     "cross-env": "~7.0.2",
-    "date-fns": "2.11.1",
+    "date-fns": "2.12.0",
     "express": "~4.17.1",
     "graphql": "~14.6.0",
     "jsonwebtoken": "~8.5.1",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index ec9ce0ae4..5ca3ef614 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -6709,10 +6709,10 @@ data-urls@^1.0.0, data-urls@^1.1.0:
     whatwg-mimetype "^2.2.0"
     whatwg-url "^7.0.0"
 
-date-fns@2.11.1:
-  version "2.11.1"
-  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.11.1.tgz#197b8be1bbf5c5e6fe8bea817f0fe111820e7a12"
-  integrity sha512-3RdUoinZ43URd2MJcquzBbDQo+J87cSzB8NkXdZiN5ia1UNyep0oCyitfiL88+R7clGTeq/RniXAc16gWyAu1w==
+date-fns@2.12.0:
+  version "2.12.0"
+  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.12.0.tgz#01754c8a2f3368fc1119cf4625c3dad8c1845ee6"
+  integrity sha512-qJgn99xxKnFgB1qL4jpxU7Q2t0LOn1p8KMIveef3UZD7kqjT3tpFNNdXJelEHhE+rUgffriXriw/sOSU+cS1Hw==
 
 date-fns@^1.27.2:
   version "1.30.1"

From 9af0fe01ced8cf9ea3ef1b1fb87c6aa7da779ffb Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 13 Apr 2020 04:14:52 +0000
Subject: [PATCH 50/54] build(deps): bump apollo-link-context from 1.0.19 to
 1.0.20 in /backend

Bumps [apollo-link-context](https://github.com/apollographql/apollo-link) from 1.0.19 to 1.0.20.
- [Release notes](https://github.com/apollographql/apollo-link/releases)
- [Changelog](https://github.com/apollographql/apollo-link/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-link/compare/apollo-link-context@1.0.19...apollo-link-context@1.0.20)

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

diff --git a/backend/package.json b/backend/package.json
index 0a1fd20b3..ff2f4d2f8 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -41,7 +41,7 @@
     "@sentry/node": "^5.15.4",
     "apollo-cache-inmemory": "~1.6.5",
     "apollo-client": "~2.6.8",
-    "apollo-link-context": "~1.0.19",
+    "apollo-link-context": "~1.0.20",
     "apollo-link-http": "~1.5.17",
     "apollo-server": "~2.11.0",
     "apollo-server-express": "^2.12.0",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index f2ad5b228..d53c6b169 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -2016,12 +2016,12 @@ apollo-graphql@^0.4.0:
     apollo-env "^0.6.1"
     lodash.sortby "^4.7.0"
 
-apollo-link-context@~1.0.19:
-  version "1.0.19"
-  resolved "https://registry.yarnpkg.com/apollo-link-context/-/apollo-link-context-1.0.19.tgz#3c9ba5bf75ed5428567ce057b8837ef874a58987"
-  integrity sha512-TUi5TyufU84hEiGkpt+5gdH5HkB3Gx46npNfoxR4of3DKBCMuItGERt36RCaryGcU/C3u2zsICU3tJ+Z9LjFoQ==
+apollo-link-context@~1.0.20:
+  version "1.0.20"
+  resolved "https://registry.yarnpkg.com/apollo-link-context/-/apollo-link-context-1.0.20.tgz#1939ac5dc65d6dff0c855ee53521150053c24676"
+  integrity sha512-MLLPYvhzNb8AglNsk2NcL9AvhO/Vc9hn2ZZuegbhRHGet3oGr0YH9s30NS9+ieoM0sGT11p7oZ6oAILM/kiRBA==
   dependencies:
-    apollo-link "^1.2.13"
+    apollo-link "^1.2.14"
     tslib "^1.9.3"
 
 apollo-link-http-common@^0.2.15, apollo-link-http-common@^0.2.16:

From fb95c7902de81d1c78adab0690369ef7ed28e8f0 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 13 Apr 2020 04:18:50 +0000
Subject: [PATCH 51/54] build(deps-dev): bump css-loader from 3.5.1 to 3.5.2 in
 /webapp

Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 3.5.1 to 3.5.2.
- [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/compare/v3.5.1...v3.5.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 34a878c50..15489fc83 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.5.1",
+    "css-loader": "~3.5.2",
     "eslint": "~6.8.0",
     "eslint-config-prettier": "~6.10.1",
     "eslint-config-standard": "~14.1.1",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index 42e430e2d..eba52d9cc 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -6445,10 +6445,10 @@ 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.4.2, css-loader@~3.5.1:
-  version "3.5.1"
-  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-3.5.1.tgz#db2b2336f4169edb68e6a829ad4fd36552647b77"
-  integrity sha512-0G4CbcZzQ9D1Q6ndOfjFuMDo8uLYMu5vc9Abs5ztyHcKvmil6GJrMiNjzzi3tQvUF+mVRuDg7bE6Oc0Prolgig==
+css-loader@^3.0.0, css-loader@^3.4.2, css-loader@~3.5.2:
+  version "3.5.2"
+  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-3.5.2.tgz#6483ae56f48a7f901fbe07dde2fc96b01eafab3c"
+  integrity sha512-hDL0DPopg6zQQSRlZm0hyeaqIRnL0wbWjay9BZxoiJBpbfOW4WHfbaYQhwnDmEa0kZUc1CJ3IFo15ot1yULMIQ==
   dependencies:
     camelcase "^5.3.1"
     cssesc "^3.0.0"

From ee33731178dd6a88247ad2889f4f7db3383865af Mon Sep 17 00:00:00 2001
From: Raphael Beer <raphael.beer@protonmail.com>
Date: Wed, 15 Apr 2020 23:32:04 +0200
Subject: [PATCH 52/54] Review: test improvements

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 .../features/FollowList/FollowList.spec.js       | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/webapp/components/features/FollowList/FollowList.spec.js b/webapp/components/features/FollowList/FollowList.spec.js
index 35c9271ca..620ac965e 100644
--- a/webapp/components/features/FollowList/FollowList.spec.js
+++ b/webapp/components/features/FollowList/FollowList.spec.js
@@ -69,8 +69,8 @@ describe('FollowList.vue', () => {
           const wrapper = Wrapper({ user, type: 'following' })
           wrapper.find('.base-button').trigger('click')
 
-          expect(wrapper.vm.connections).toEqual(user.following)
           expect(wrapper.vm.allConnectionsCount).toBe(user.followingCount)
+          expect(wrapper.findAll('.user-teaser')).toHaveLength(user.following.length)
           expect(wrapper.emitted('fetchAllConnections')).toEqual([['following']])
         })
       })
@@ -80,8 +80,8 @@ describe('FollowList.vue', () => {
           const wrapper = Wrapper({ type: 'followedBy' })
           wrapper.find('.base-button').trigger('click')
 
-          expect(wrapper.vm.connections).toEqual(user.followedBy)
           expect(wrapper.vm.allConnectionsCount).toBe(user.followedByCount)
+          expect(wrapper.findAll('.user-teaser')).toHaveLength(user.followedBy.length)
           expect(wrapper.emitted('fetchAllConnections')).toEqual([['followedBy']])
         })
       })
@@ -90,7 +90,7 @@ describe('FollowList.vue', () => {
     describe('given no type', () => {
       it('defaults type to `following`', () => {
         const wrapper = Wrapper()
-        expect(wrapper.vm.type).toBe('following')
+        expect(wrapper.text()).toContain('profile.network.following')
       })
     })
 
@@ -98,15 +98,15 @@ describe('FollowList.vue', () => {
       describe('without connections', () => {
         it('displays the followingNobody message', () => {
           const wrapper = Wrapper({ user: noConnectionsUser })
-          expect(wrapper.find('.nobody-message').text()).toBe(
-            `${noConnectionsUser.name} ${wrapper.vm.$t(`profile.network.followingNobody`)}`,
+          expect(wrapper.find('.nobody-message').text()).toContain(
+            'profile.network.followingNobody',
           )
         })
 
         it('displays the followedByNobody message', () => {
           const wrapper = Wrapper({ user: noConnectionsUser, type: 'followedBy' })
-          expect(wrapper.find('.nobody-message').text()).toBe(
-            `${noConnectionsUser.name} ${wrapper.vm.$t(`profile.network.followedByNobody`)}`,
+          expect(wrapper.find('.nobody-message').text()).toContain(
+            'profile.network.followedByNobody',
           )
         })
       })
@@ -118,7 +118,7 @@ describe('FollowList.vue', () => {
         })
 
         it(`renders the connections`, () => {
-          expect(wrapper.findAll('.user-teaser').length).toEqual(user.following.length)
+          expect(wrapper.findAll('.user-teaser')).toHaveLength(user.following.length)
         })
 
         it(`has a button to load all remaining connections`, async () => {

From 97a30ad8f8c98dde5809f206fc51e0534c0b97de Mon Sep 17 00:00:00 2001
From: Raphael Beer <raphael.beer@protonmail.com>
Date: Thu, 16 Apr 2020 20:15:10 +0200
Subject: [PATCH 53/54] Review: more cut off user-teaser vsisible

---
 webapp/assets/_new/styles/tokens.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/assets/_new/styles/tokens.scss b/webapp/assets/_new/styles/tokens.scss
index c4738f8ac..00b064e7e 100644
--- a/webapp/assets/_new/styles/tokens.scss
+++ b/webapp/assets/_new/styles/tokens.scss
@@ -240,7 +240,7 @@ $size-height-base: 42px;
 $size-height-large: 50px;
 $size-height-xlarge: 60px;
 $size-height-footer: 64px;
-$size-height-connections: 300px;
+$size-height-connections: 315px;
 $size-tappable-square: 44px;
 $size-ribbon: 6px;
 

From e70faa0a2dad35c2dc296ee3c6edd4fcf41f211d Mon Sep 17 00:00:00 2001
From: Raphael Beer <raphael.beer@protonmail.com>
Date: Thu, 16 Apr 2020 20:59:35 +0200
Subject: [PATCH 54/54] Review: user-teasers as unordered list

---
 webapp/assets/_new/styles/tokens.scss         |  1 +
 .../features/FollowList/FollowList.spec.js    |  4 +--
 .../features/FollowList/FollowList.vue        | 28 ++++++++++++-------
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/webapp/assets/_new/styles/tokens.scss b/webapp/assets/_new/styles/tokens.scss
index 00b064e7e..3cc05b782 100644
--- a/webapp/assets/_new/styles/tokens.scss
+++ b/webapp/assets/_new/styles/tokens.scss
@@ -230,6 +230,7 @@ $space-small: 16px;
 $space-x-small: 8px;
 $space-xx-small: 4px;
 $space-xxx-small: 2px;
+$space-none: 0;
 
 /**
  * @tokens Size Height
diff --git a/webapp/components/features/FollowList/FollowList.spec.js b/webapp/components/features/FollowList/FollowList.spec.js
index 620ac965e..44a855eed 100644
--- a/webapp/components/features/FollowList/FollowList.spec.js
+++ b/webapp/components/features/FollowList/FollowList.spec.js
@@ -137,8 +137,8 @@ describe('FollowList.vue', () => {
           expect(wrapper.findAll('.user-teaser')).toHaveLength(allConnectionsUser.followingCount)
         })
 
-        it('renders the user-teasers in an overflow-container', () => {
-          expect(wrapper.find('.--overflow').is('div')).toBe(true)
+        it('renders the user-teasers as an overflowing list', () => {
+          expect(wrapper.find('.--overflow').is('ul')).toBe(true)
         })
 
         it('renders a filter text input', () => {
diff --git a/webapp/components/features/FollowList/FollowList.vue b/webapp/components/features/FollowList/FollowList.vue
index be8c35e1a..633896e08 100644
--- a/webapp/components/features/FollowList/FollowList.vue
+++ b/webapp/components/features/FollowList/FollowList.vue
@@ -4,14 +4,15 @@
       <h5 class="title spacer-x-small">
         {{ userName | truncate(15) }} {{ $t(`profile.network.${type}`) }}
       </h5>
-      <div :class="connectionsClass">
-        <user-teaser
+      <ul :class="connectionsClass">
+        <li
           v-for="connection in filteredConnections"
           :key="connection.id"
-          :user="connection"
-          class="spacer-x-small"
-        />
-      </div>
+          class="connections__item"
+        >
+          <user-teaser :user="connection" />
+        </li>
+      </ul>
       <base-button
         v-if="hasMore"
         :loading="loading"
@@ -135,10 +136,21 @@ export default {
 
   .connections {
     height: $size-height-connections;
+    padding: $space-none;
+    list-style-type: none;
 
     &.--overflow {
       overflow-y: auto;
     }
+
+    > .connections__item {
+      padding: $space-xx-small;
+
+      &.is-selected,
+      &:hover {
+        background-color: $background-color-primary-inverse;
+      }
+    }
   }
 
   .nobody-message {
@@ -149,9 +161,5 @@ export default {
   > :nth-child(n):not(:last-child) {
     margin-bottom: $space-small;
   }
-
-  .user-teaser {
-    margin-bottom: $space-x-small;
-  }
 }
 </style>