From 5e77ee0cee42bde7200b7ce7451d0479baae2938 Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Wed, 26 Feb 2020 12:44:41 +0100
Subject: [PATCH] Fix helloEmail, make linter happy

---
 .../assignment/SubmissionForm.vue             |  1 -
 client/src/layouts/PublicLayout.vue           |  3 ---
 client/src/pages/hello.vue                    |  3 +--
 client/src/pages/license-activation.vue       |  6 ++----
 client/src/pages/registration.vue             | 19 ++++++++++++-------
 5 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/client/src/components/content-blocks/assignment/SubmissionForm.vue b/client/src/components/content-blocks/assignment/SubmissionForm.vue
index 985131bb..bb8bfd93 100644
--- a/client/src/components/content-blocks/assignment/SubmissionForm.vue
+++ b/client/src/components/content-blocks/assignment/SubmissionForm.vue
@@ -89,7 +89,6 @@
       spellcheckText() {
         if (!this.spellcheckLoading) {
           return 'Rechtschreibung prüfen'
-
         } else {
           return 'Wird geprüft...'
         }
diff --git a/client/src/layouts/PublicLayout.vue b/client/src/layouts/PublicLayout.vue
index 4503f6f3..4db121aa 100644
--- a/client/src/layouts/PublicLayout.vue
+++ b/client/src/layouts/PublicLayout.vue
@@ -48,7 +48,6 @@ import Logo from '@/components/icons/Logo';
       margin-bottom: $large-spacing;
     }
 
-
     &__logo {
       @include content-block();
     }
@@ -66,6 +65,4 @@ import Logo from '@/components/icons/Logo';
       @include content-block();
     }
   }
-
-
 </style>
diff --git a/client/src/pages/hello.vue b/client/src/pages/hello.vue
index d0ed463d..cc6063ad 100644
--- a/client/src/pages/hello.vue
+++ b/client/src/pages/hello.vue
@@ -56,8 +56,7 @@ export default {
               variables: {
                 helloEmail: this.email
               }
-            });
-            this.$router.push({name: redirectRouteName, query: this.$route.query});
+            }).then(() => this.$router.push({name: redirectRouteName, query: this.$route.query}));
           })
           .catch(() => {
             this.registrationError = 'Es ist ein Fehler aufgetreten. Bitte versuchen Sie es nochmals.';
diff --git a/client/src/pages/license-activation.vue b/client/src/pages/license-activation.vue
index e532afc0..9c1348ad 100644
--- a/client/src/pages/license-activation.vue
+++ b/client/src/pages/license-activation.vue
@@ -81,12 +81,10 @@ export default {
                     query: ME_QUERY,
                     fetchPolicy: 'network-only',
                   }).then(() => that.$router.push('/'));
-              }
-              else {
+              } else {
                 if (coupon.errors[0].field === 'invalid_coupon') {
                   that.couponErrors = ['Der angegebene Coupon-Code ist falsch.'];
-                }
-                else {
+                } else {
                   that.couponErrors = ['Es ist ein Fehler aufgetreten. Bitte versuchen Sie es nochmals oder kontaktieren Sie den Administrator.'];
                 }
               }
diff --git a/client/src/pages/registration.vue b/client/src/pages/registration.vue
index f706d9fa..859e32bb 100644
--- a/client/src/pages/registration.vue
+++ b/client/src/pages/registration.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="registration public-page">
     <header class="info-header">
-      <p class="info-header__text small-emph">Für <span class="info-header__emph">{{helloEmail.email}}</span> haben wir kein Hep Konto gefunden.</p>
+      <p class="info-header__text small-emph">Für <span class="info-header__emph">{{helloEmail}}</span> haben wir kein Hep Konto gefunden.</p>
       <h1 class="registration__title public-page__title" data-cy="registration-title">Damit Sie mySkillbox verwenden können, müssen Sie ein Konto erstellen.</h1>
     </header>
     <form class="registration__form registration-form" novalidate @submit.prevent="validateBeforeSubmit">
@@ -220,7 +220,7 @@ export default {
           const registrationData = {
             customer: {
               prefix: this.prefix,
-              email: this.helloEmail.email,
+              email: this.helloEmail,
               firstname: this.firstname,
               lastname: this.lastname,
               gender: this.prefix === 'Herr' ? 1 : 2,
@@ -298,19 +298,24 @@ export default {
       postcodeErrors: [],
       registrationError: '',
       submitted: false,
-      helloEmail: {
-        email: ''
-      }
+      helloEmail: ''
     };
   },
 
   apollo: {
     helloEmail: {
       query: HELLO_EMAIL,
-      result({data: {helloEmail}}) {
-        if (helloEmail.email === '') {
+      result({data}) {
+        if (data.helloEmail && data.helloEmail.email === '') {
           this.$router.push({name: 'hello'});
         }
+      },
+      update(data) {
+        return data.helloEmail.email;
+      },
+      error() {
+        console.log('error')
+        this.$router.push({name: 'hello'});
       }
     },
   },