From e544725e873a89299c91f981ffa562ff85532dcf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Mon, 9 Sep 2019 10:27:21 +0200
Subject: [PATCH] Remove `editPending` and `SET_EDIT_PENDING` from the store

---
 webapp/components/Comment.vue                 |  7 ++----
 .../CommentForm/CommentForm.spec.js           |  1 -
 webapp/components/CommentForm/CommentForm.vue |  8 +------
 .../EditCommentForm/EditCommentForm.vue       | 24 +++++++++----------
 webapp/store/editor.js                        |  7 ------
 5 files changed, 15 insertions(+), 32 deletions(-)

diff --git a/webapp/components/Comment.vue b/webapp/components/Comment.vue
index 7547927eb..fbb39c094 100644
--- a/webapp/components/Comment.vue
+++ b/webapp/components/Comment.vue
@@ -58,7 +58,7 @@
 </template>
 
 <script>
-import { mapGetters, mapMutations } from 'vuex'
+import { mapGetters } from 'vuex'
 import HcUser from '~/components/User/User'
 import ContentMenu from '~/components/ContentMenu'
 import ContentViewer from '~/components/Editor/ContentViewer'
@@ -126,15 +126,12 @@ export default {
     },
   },
   methods: {
-    ...mapMutations({
-      setEditPending: 'editor/SET_EDIT_PENDING',
-    }),
     isAuthor(id) {
       return this.user.id === id
     },
     editCommentMenu(showMenu) {
+      console.log('editCommentMenu, showMenu: ', showMenu)
       this.openEditCommentMenu = showMenu
-      this.setEditPending(showMenu)
     },
     async deleteCommentCallback() {
       try {
diff --git a/webapp/components/CommentForm/CommentForm.spec.js b/webapp/components/CommentForm/CommentForm.spec.js
index 8aab9bf65..594c6e45b 100644
--- a/webapp/components/CommentForm/CommentForm.spec.js
+++ b/webapp/components/CommentForm/CommentForm.spec.js
@@ -54,7 +54,6 @@ describe('CommentForm.vue', () => {
       'editor/placeholder': () => {
         return 'some cool placeholder'
       },
-      'editor/editPending': () => false,
     }
     const store = new Vuex.Store({
       getters,
diff --git a/webapp/components/CommentForm/CommentForm.vue b/webapp/components/CommentForm/CommentForm.vue
index 8439165d4..935784c28 100644
--- a/webapp/components/CommentForm/CommentForm.vue
+++ b/webapp/components/CommentForm/CommentForm.vue
@@ -1,5 +1,5 @@
 <template>
-  <ds-form v-show="!editPending" v-model="form" @submit="handleSubmit">
+  <ds-form v-model="form" @submit="handleSubmit">
     <template slot-scope="{ errors }">
       <ds-card>
         <hc-editor
@@ -30,7 +30,6 @@
 
 <script>
 import gql from 'graphql-tag'
-import { mapGetters } from 'vuex'
 import HcEditor from '~/components/Editor/Editor'
 import PostQuery from '~/graphql/PostQuery'
 import CommentMutations from '~/graphql/CommentMutations'
@@ -52,11 +51,6 @@ export default {
       users: [],
     }
   },
-  computed: {
-    ...mapGetters({
-      editPending: 'editor/editPending',
-    }),
-  },
   methods: {
     updateEditorContent(value) {
       const content = value.replace(/<(?:.|\n)*?>/gm, '').trim()
diff --git a/webapp/components/EditCommentForm/EditCommentForm.vue b/webapp/components/EditCommentForm/EditCommentForm.vue
index 2d20dc821..34e45a8b8 100644
--- a/webapp/components/EditCommentForm/EditCommentForm.vue
+++ b/webapp/components/EditCommentForm/EditCommentForm.vue
@@ -8,14 +8,19 @@
         <ds-flex :gutter="{ base: 'small', md: 'small', sm: 'x-large', xs: 'x-large' }">
           <ds-flex-item :width="{ base: '0%', md: '50%', sm: '0%', xs: '0%' }" />
           <ds-flex-item :width="{ base: '40%', md: '20%', sm: '30%', xs: '30%' }">
-            <ds-button ghost class="cancelBtn" @click.prevent="closeEditWindow">
-              {{ $t('actions.cancel') }}
-            </ds-button>
+            <ds-button
+              ghost
+              class="cancelBtn"
+              @click.prevent="closeEditWindow"
+            >{{ $t('actions.cancel') }}</ds-button>
           </ds-flex-item>
           <ds-flex-item :width="{ base: '40%', md: '20%', sm: '40%', xs: '40%' }">
-            <ds-button type="submit" :loading="loading" :disabled="disabled || errors" primary>
-              {{ $t('post.comment.submit') }}
-            </ds-button>
+            <ds-button
+              type="submit"
+              :loading="loading"
+              :disabled="disabled || errors"
+              primary
+            >{{ $t('post.comment.submit') }}</ds-button>
           </ds-flex-item>
         </ds-flex>
       </ds-card>
@@ -26,7 +31,6 @@
 <script>
 import gql from 'graphql-tag'
 import HcEditor from '~/components/Editor/Editor'
-import { mapMutations } from 'vuex'
 import CommentMutations from '~/graphql/CommentMutations.js'
 
 export default {
@@ -52,9 +56,6 @@ export default {
     }
   },
   methods: {
-    ...mapMutations({
-      setEditPending: 'editor/SET_EDIT_PENDING',
-    }),
     updateEditorContent(value) {
       const sanitizedContent = value.replace(/<(?:.|\n)*?>/gm, '').trim()
       this.disabled = value === this.comment.content || sanitizedContent.length < 1
@@ -79,8 +80,7 @@ export default {
 
           this.$toast.success(this.$t('post.comment.updated'))
           this.disabled = false
-          this.$emit('showEditCommentMenu', false)
-          this.setEditPending(false)
+          this.closeEditWindow()
         })
         .catch(err => {
           this.$toast.error(err.message)
diff --git a/webapp/store/editor.js b/webapp/store/editor.js
index cbf9d9289..9c5f665a0 100644
--- a/webapp/store/editor.js
+++ b/webapp/store/editor.js
@@ -1,7 +1,6 @@
 export const state = () => {
   return {
     placeholder: null,
-    editPending: false,
   }
 }
 
@@ -9,16 +8,10 @@ export const getters = {
   placeholder(state) {
     return state.placeholder
   },
-  editPending(state) {
-    return state.editPending
-  },
 }
 
 export const mutations = {
   SET_PLACEHOLDER_TEXT(state, text) {
     state.placeholder = text
   },
-  SET_EDIT_PENDING(state, boolean) {
-    state.editPending = boolean
-  },
 }