diff --git a/webapp/components/Modal/DeleteModal.spec.js b/webapp/components/Modal/DeleteModal.spec.js index c5e9df001..3401d5ba3 100644 --- a/webapp/components/Modal/DeleteModal.spec.js +++ b/webapp/components/Modal/DeleteModal.spec.js @@ -164,7 +164,7 @@ describe('DeleteModal.vue', () => { expect(propsData.callbacks.confirm).toHaveBeenCalledTimes(1) }) it('emits close', () => { - expect(wrapper.emitted().close).toBeTruthy() + expect(wrapper.emitted().close).toHaveLength(1) }) it('resets success', () => { diff --git a/webapp/components/PostCard/index.vue b/webapp/components/PostCard/index.vue index 96e1f5d72..383f879bd 100644 --- a/webapp/components/PostCard/index.vue +++ b/webapp/components/PostCard/index.vue @@ -103,8 +103,8 @@ export default { return this.user.id === this.post.author.id }, menuModalsData() { - // "this.post" may not always be defined at the beginning … return PostHelpers.postMenuModalsData( + // "this.post" may not always be defined at the beginning … this.post ? this.$filters.truncate(this.post.title, 30) : '', this.deletePostCallback, ) @@ -115,7 +115,7 @@ export default { try { await this.$apollo.mutate(PostHelpers.deletePostMutationData(this.post.id)) this.$toast.success(this.$t('delete.contribution.success')) - this.$emit('deletePost') + this.$emit('removePostFromList') } catch (err) { this.$toast.error(err.message) } diff --git a/webapp/components/PostHelpers.js b/webapp/components/PostHelpers.js index df2064bfc..4a30e6a22 100644 --- a/webapp/components/PostHelpers.js +++ b/webapp/components/PostHelpers.js @@ -1,7 +1,7 @@ import gql from 'graphql-tag' export default { - postMenuModalsData: (postNameShort, confirmCallback) => { + postMenuModalsData(postNameShort, confirmCallback) { return { delete: { titleIdent: 'delete.contribution.title', diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue index d8becf206..10a64ee0f 100644 --- a/webapp/pages/index.vue +++ b/webapp/pages/index.vue @@ -9,7 +9,7 @@ :key="post.id" :post="post" :width="{ base: '100%', xs: '100%', md: '50%', xl: '33%' }" - @deletePost="deletePost(index, post.id)" + @removePostFromList="deletePost(index, post.id)" /> diff --git a/webapp/pages/post/_id/_slug/index.vue b/webapp/pages/post/_id/_slug/index.vue index 63b0713c5..899950514 100644 --- a/webapp/pages/post/_id/_slug/index.vue +++ b/webapp/pages/post/_id/_slug/index.vue @@ -210,9 +210,9 @@ export default { }, 50) }, computed: { - // "this.post" may not always be defined at the beginning … menuModalsData() { return PostHelpers.postMenuModalsData( + // "this.post" may not always be defined at the beginning … this.post ? this.$filters.truncate(this.post.title, 30) : '', this.deletePostCallback, ) diff --git a/webapp/pages/post/_id/_slug/more-info.vue b/webapp/pages/post/_id/_slug/more-info.vue index 1cb93ae6c..00de48730 100644 --- a/webapp/pages/post/_id/_slug/more-info.vue +++ b/webapp/pages/post/_id/_slug/more-info.vue @@ -1,13 +1,10 @@ - + Wer folgt {{ userName | truncate(15) }}? @@ -101,13 +102,14 @@ - + - - und {{ user.followedByCount - user.followedBy.length }} weitere - + und {{ user.followedByCount - user.followedBy.length }} weitere