From e00de176e20e1d608f2c915749d911391fb065c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Tue, 23 Mar 2021 17:43:41 +0100
Subject: [PATCH] Cleanup in general

---
 .../Registration/RegistrationSlideCreate.vue  |  4 +-
 .../Registration/RegistrationSlideEmail.vue   | 25 +------
 webapp/components/Registration/Signup.vue     | 26 +++----
 webapp/locales/de.json                        |  1 -
 webapp/locales/en.json                        |  1 -
 webapp/locales/es.json                        |  1 -
 webapp/locales/fr.json                        |  1 -
 webapp/locales/it.json                        |  1 -
 webapp/locales/pt.json                        |  1 -
 webapp/locales/ru.json                        |  1 -
 webapp/pages/registration.spec.js             | 70 -------------------
 11 files changed, 14 insertions(+), 118 deletions(-)

diff --git a/webapp/components/Registration/RegistrationSlideCreate.vue b/webapp/components/Registration/RegistrationSlideCreate.vue
index 532dc00b6..7ac235994 100644
--- a/webapp/components/Registration/RegistrationSlideCreate.vue
+++ b/webapp/components/Registration/RegistrationSlideCreate.vue
@@ -23,12 +23,10 @@
     </ds-space>
   </div>
   <div v-else class="create-account-card">
-    <!-- Wolle ??? submit -->
     <ds-form
       class="create-user-account"
       v-model="formData"
       :schema="formSchema"
-      @submit="submit"
       @input="handleInput"
       @input-valid="handleInputValid"
     >
@@ -136,7 +134,7 @@ export default {
         },
         ...passwordForm.formSchema,
       },
-      response: null, // Wolle
+      response: null,
       // TODO: Our styleguide does not support checkmarks.
       // Integrate termsAndConditionsConfirmed into `this.formData` once we
       // have checkmarks available.
diff --git a/webapp/components/Registration/RegistrationSlideEmail.vue b/webapp/components/Registration/RegistrationSlideEmail.vue
index 219d3615c..5289248cc 100644
--- a/webapp/components/Registration/RegistrationSlideEmail.vue
+++ b/webapp/components/Registration/RegistrationSlideEmail.vue
@@ -6,26 +6,11 @@
     @input="handleInput"
     @input-valid="handleInputValid"
   >
-    <!-- Wolle <h1>
-        {{
-          invitation
-            ? $t('profile.invites.title', metadata)
-            : $t('components.registration.signup.title', metadata)
-        }}
-      </h1> -->
-    <!-- Wolle <ds-text
-      v-if="token"
-      v-html="$t('registration.signup.form.invitation-code', { code: token })"
-    /> -->
     <ds-text>
-      {{
-        invitation
-          ? $t('profile.invites.description')
-          : $t('components.registration.signup.form.description')
-      }}
+      {{ $t('components.registration.signup.form.description') }}
     </ds-text>
     <ds-input
-      :placeholder="invitation ? $t('profile.invites.emailPlaceholder') : $t('login.email')"
+      :placeholder="$t('login.email')"
       type="email"
       id="email"
       model="email"
@@ -48,7 +33,6 @@ import metadata from '~/constants/metadata'
 import { isEmail } from 'validator'
 import normalizeEmail from '~/components/utils/NormalizeEmail'
 import translateErrorMessage from '~/components/utils/TranslateErrorMessage'
-// Wolle import { SweetalertIcon } from 'vue-sweetalert-icons'
 
 export const SignupMutation = gql`
   mutation($email: String!, $inviteCode: String) {
@@ -59,13 +43,8 @@ export const SignupMutation = gql`
 `
 export default {
   name: 'RegistrationSlideEmail',
-  components: {
-    // Wolle SweetalertIcon,
-  },
   props: {
     sliderData: { type: Object, required: true },
-    // token: { type: String, default: null }, // Wolle not used???
-    invitation: { type: Boolean, default: false }, // Wolle ???
   },
   data() {
     return {
diff --git a/webapp/components/Registration/Signup.vue b/webapp/components/Registration/Signup.vue
index b0d8b4111..86142c338 100644
--- a/webapp/components/Registration/Signup.vue
+++ b/webapp/components/Registration/Signup.vue
@@ -67,6 +67,7 @@
 import gql from 'graphql-tag'
 import metadata from '~/constants/metadata'
 import { SweetalertIcon } from 'vue-sweetalert-icons'
+import translateErrorMessage from '~/components/utils/TranslateErrorMessage'
 
 export const SignupMutation = gql`
   mutation($email: String!, $inviteCode: String) {
@@ -127,21 +128,16 @@ export default {
           this.$emit('submit', { email: this.data.Signup.email })
         }, 3000)
       } catch (err) {
-        const { message } = err
-        const mapping = {
-          'A user account with this email already exists': 'email-exists',
-          // Wolle 'Invitation code already used or does not exist': 'invalid-invitation-token',
-        }
-        for (const [pattern, key] of Object.entries(mapping)) {
-          if (message.includes(pattern))
-            this.error = {
-              key,
-              message: this.$t(`components.registration.signup.form.errors.${key}`),
-            }
-        }
-        if (!this.error) {
-          this.$toast.error(message)
-        }
+        this.$toast.error(
+          translateErrorMessage(
+            err.message,
+            {
+              'A user account with this email already exists':
+                'components.registration.signup.form.errors.email-exists',
+            },
+            this.$t,
+          ),
+        )
       }
     },
   },
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 83239c744..ddc396a31 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -198,7 +198,6 @@
           "errors": {
             "email-exists": "Es gibt schon ein Benutzerkonto mit dieser E-Mail-Adresse!"
           },
-          "invitation-code": "Dein Einladungscode lautet: <b>{code}</b>",
           "minimum-age": "Ich bin 18 Jahre oder älter.",
           "no-commercial": "Ich habe keine kommerziellen Absichten und ich repräsentiere kein kommerzielles Unternehmen oder Organisation.",
           "no-political": "Ich bin nicht im Auftrag einer Partei oder politischen Organisation im Netzwerk.",
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index e05def190..a8ebd6e11 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -198,7 +198,6 @@
           "errors": {
             "email-exists": "There is already a user account with this e-mail address!"
           },
-          "invitation-code": "Your invitation code is: <b>{code}</b>",
           "minimum-age": "I'm 18 years or older.",
           "no-commercial": "I have no commercial interests and I am not representing a company or any other commercial organisation on the network.",
           "no-political": "I am not on behalf of a party or political organization in the network.",
diff --git a/webapp/locales/es.json b/webapp/locales/es.json
index 80e767028..6397bbd00 100644
--- a/webapp/locales/es.json
+++ b/webapp/locales/es.json
@@ -155,7 +155,6 @@
           "errors": {
             "email-exists": "¡Ya hay una cuenta de usuario con esta dirección de correo electrónico!"
           },
-          "invitation-code": "Su código de invitación es: <b>{code}</b>",
           "minimum-age": "Tengo 18 años o más.",
           "no-commercial": "No tengo intensiones comerciales y no represento una empresa u organización comercial.",
           "no-political": "No estoy en la red en nombre de un partido o una organización política.",
diff --git a/webapp/locales/fr.json b/webapp/locales/fr.json
index 0c55649f6..a9182d987 100644
--- a/webapp/locales/fr.json
+++ b/webapp/locales/fr.json
@@ -155,7 +155,6 @@
           "errors": {
             "email-exists": "Il existe déjà un compte utilisateur avec cette adresse mail!"
           },
-          "invitation-code": "Votre code d'invitation est: <b> {code} </b>",
           "minimum-age": "J'ai 18 ans ou plus.",
           "no-commercial": "Je n'ai aucun intérêt commercial et je ne représente pas d'entreprise ou toute autre organisation commerciale sur le réseau.",
           "no-political": "Je ne parle pas au nom d'un parti ou d'une organisation politique sur le réseau.",
diff --git a/webapp/locales/it.json b/webapp/locales/it.json
index 8f994c0e9..d191a6d1a 100644
--- a/webapp/locales/it.json
+++ b/webapp/locales/it.json
@@ -162,7 +162,6 @@
           "errors": {
             "email-exists": null
           },
-          "invitation-code": null,
           "minimum-age": null,
           "submit": null,
           "success": null,
diff --git a/webapp/locales/pt.json b/webapp/locales/pt.json
index 543d8920a..8b24b1a67 100644
--- a/webapp/locales/pt.json
+++ b/webapp/locales/pt.json
@@ -202,7 +202,6 @@
           "errors": {
             "email-exists": "Já existe uma conta de usuário com este endereço de e-mail!"
           },
-          "invitation-code": "O seu código de convite é: <b>{code}</b>",
           "minimum-age": "Tenho 18 anos ou mais.",
           "submit": "Criar uma conta",
           "success": "Um e-mail com um link para completar o seu registo foi enviado para <b>{email}</b>",
diff --git a/webapp/locales/ru.json b/webapp/locales/ru.json
index 6c5b1ac46..6b4db17ed 100644
--- a/webapp/locales/ru.json
+++ b/webapp/locales/ru.json
@@ -155,7 +155,6 @@
           "errors": {
             "email-exists": "Уже есть учетная запись пользователя с этим адресом электронной почты!"
           },
-          "invitation-code": "Код приглашения: <b>{code}</b>",
           "minimum-age": "Мне 18 лет или более",
           "no-commercial": "У меня нет коммерческих намерений, и я не представляю коммерческое предприятие или организацию.",
           "no-political": "Я не от имени какой-либо партии или политической организации в сети.",
diff --git a/webapp/pages/registration.spec.js b/webapp/pages/registration.spec.js
index 0f6f2ab43..b83cb6ad4 100644
--- a/webapp/pages/registration.spec.js
+++ b/webapp/pages/registration.spec.js
@@ -1,6 +1,5 @@
 import { config, mount } from '@vue/test-utils'
 import Registration from './registration.vue'
-import Vuex from 'vuex'
 import Vue from 'vue'
 
 const localVue = global.localVue
@@ -13,78 +12,14 @@ config.stubs['infinite-loading'] = '<span><slot /></span>'
 describe('Registration', () => {
   let wrapper
   let Wrapper
-  let store
   let mocks
-  let mutations
 
   beforeEach(() => {
-    mutations = {
-      'posts/SELECT_ORDER': jest.fn(),
-    }
-    // Wolle what is needed here?
-    store = new Vuex.Store({
-      getters: {
-        'posts/filter': () => ({}),
-        'posts/orderOptions': () => () => [
-          {
-            key: 'store.posts.orderBy.oldest.label',
-            label: 'store.posts.orderBy.oldest.label',
-            icon: 'sort-amount-asc',
-            value: 'createdAt_asc',
-          },
-          {
-            key: 'store.posts.orderBy.newest.label',
-            label: 'store.posts.orderBy.newest.label',
-            icon: 'sort-amount-desc',
-            value: 'createdAt_desc',
-          },
-        ],
-        'posts/selectedOrder': () => () => 'createdAt_desc',
-        'posts/orderIcon': () => 'sort-amount-desc',
-        'posts/orderBy': () => 'createdAt_desc',
-        'auth/user': () => {
-          return { id: 'u23' }
-        },
-      },
-      mutations,
-    })
     mocks = {
       $t: (key) => key,
-      $filters: {
-        truncate: (a) => a,
-        removeLinks: jest.fn(),
-      },
       $i18n: {
         locale: () => 'de',
       },
-      // If you are mocking router, than don't use VueRouter with localVue: https://vue-test-utils.vuejs.org/guides/using-with-vue-router.html
-      $router: {
-        history: {
-          push: jest.fn(),
-        },
-        push: jest.fn(),
-      },
-      $toast: {
-        success: jest.fn(),
-        error: jest.fn(),
-      },
-      $apollo: {
-        mutate: jest.fn().mockResolvedValue(),
-        queries: {
-          Post: {
-            refetch: jest.fn(),
-            fetchMore: jest.fn().mockResolvedValue([
-              {
-                id: 'p23',
-                name: 'It is a post',
-                author: {
-                  id: 'u1',
-                },
-              },
-            ]),
-          },
-        },
-      },
       $route: {
         query: {},
       },
@@ -95,16 +30,11 @@ describe('Registration', () => {
   describe('mount', () => {
     Wrapper = () => {
       return mount(Registration, {
-        store,
         mocks,
         localVue,
       })
     }
 
-    // Wolle beforeEach(() => {
-    //   wrapper = Wrapper()
-    // })
-
     describe('no "PUBLIC_REGISTRATION" and no "INVITE_REGISTRATION"', () => {
       beforeEach(() => {
         mocks.$env = {