From 2b73bd3019660302a810e5b4473ddf5616633194 Mon Sep 17 00:00:00 2001 From: elweyn Date: Thu, 16 Sep 2021 13:03:20 +0200 Subject: [PATCH] Changed the unsubscribed mutation since we don't need language hier. --- frontend/src/graphql/mutations.js | 6 +++--- frontend/src/store/store.test.js | 12 ++---------- .../Pages/UserProfile/UserCard_Newsletter.spec.js | 1 - .../views/Pages/UserProfile/UserCard_Newsletter.vue | 2 +- frontend/yarn.lock | 12 ------------ 5 files changed, 6 insertions(+), 27 deletions(-) diff --git a/frontend/src/graphql/mutations.js b/frontend/src/graphql/mutations.js index 6fd8500c5..4fe9533db 100644 --- a/frontend/src/graphql/mutations.js +++ b/frontend/src/graphql/mutations.js @@ -1,13 +1,13 @@ import gql from 'graphql-tag' export const subscribeNewsletter = gql` - mutation($email: String!, $language: String!) { + mutation ($email: String!, $language: String!) { subscribeNewsletter(email: $email, language: $language) } ` export const unsubscribeNewsletter = gql` - mutation($email: String!, $language: String!) { - unsubscribeNewsletter(email: $email, language: $language) + mutation ($email: String!) { + unsubscribeNewsletter(email: $email) } ` diff --git a/frontend/src/store/store.test.js b/frontend/src/store/store.test.js index 7ae3344d9..8d63a1ed9 100644 --- a/frontend/src/store/store.test.js +++ b/frontend/src/store/store.test.js @@ -1,15 +1,7 @@ import { mutations, actions } from './store' -const { - language, - email, - token, - username, - firstName, - lastName, - description, - newsletterState, -} = mutations +const { language, email, token, username, firstName, lastName, description, newsletterState } = + mutations const { login, logout } = actions describe('Vuex store', () => { diff --git a/frontend/src/views/Pages/UserProfile/UserCard_Newsletter.spec.js b/frontend/src/views/Pages/UserProfile/UserCard_Newsletter.spec.js index 28b324591..febb47fd6 100644 --- a/frontend/src/views/Pages/UserProfile/UserCard_Newsletter.spec.js +++ b/frontend/src/views/Pages/UserProfile/UserCard_Newsletter.spec.js @@ -65,7 +65,6 @@ describe('UserCard_Newsletter', () => { mutation: unsubscribeNewsletter, variables: { email: 'peter@lustig.de', - language: 'de', }, }) }) diff --git a/frontend/src/views/Pages/UserProfile/UserCard_Newsletter.vue b/frontend/src/views/Pages/UserProfile/UserCard_Newsletter.vue index e96955fa1..d5951f60b 100644 --- a/frontend/src/views/Pages/UserProfile/UserCard_Newsletter.vue +++ b/frontend/src/views/Pages/UserProfile/UserCard_Newsletter.vue @@ -43,7 +43,7 @@ export default { mutation: this.newsletterState ? subscribeNewsletter : unsubscribeNewsletter, variables: { email: this.$store.state.email, - language: this.$store.state.language, + language: this.newsletterState ? this.$store.state.language : undefined, }, }) .then(() => { diff --git a/frontend/yarn.lock b/frontend/yarn.lock index c910ea9de..eff78ada1 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -13576,13 +13576,6 @@ vue-jest@^3.0.5, vue-jest@^3.0.7: tsconfig "^7.0.0" vue-template-es2015-compiler "^1.6.0" -vue-jwt-decode@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/vue-jwt-decode/-/vue-jwt-decode-0.1.0.tgz#f9caf7b9030d5459cc567b1c3117d9d1f291458f" - integrity sha512-4iP0NzYHkAF7G13tYPc/nudk4oNpB8GCVZupc7lekxXok1XKEgefNaGTpDT14g7RKe5H9GaMphPduDj4UVfZwQ== - dependencies: - vue "^2.3.3" - vue-loader@^15.7.0: version "15.9.6" resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.9.6.tgz#f4bb9ae20c3a8370af3ecf09b8126d38ffdb6b8b" @@ -13662,11 +13655,6 @@ vue@^2.2.6, vue@^2.5.17, vue@^2.6.11: resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.12.tgz#f5ebd4fa6bd2869403e29a896aed4904456c9123" integrity sha512-uhmLFETqPPNyuLLbsKz6ioJ4q7AZHzD8ZVFNATNyICSZouqP2Sz0rotWQC8UNBF6VGSCs5abnKJoStA6JbCbfg== -vue@^2.3.3: - version "2.6.14" - resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.14.tgz#e51aa5250250d569a3fbad3a8a5a687d6036e235" - integrity sha512-x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ== - vuex-persistedstate@^4.0.0-beta.3: version "4.0.0-beta.3" resolved "https://registry.yarnpkg.com/vuex-persistedstate/-/vuex-persistedstate-4.0.0-beta.3.tgz#89dd712de72d28e85cc95467d066002c1405f277"