diff --git a/webapp/components/Comment.vue b/webapp/components/Comment.vue index 06f5b4bde..ce5433332 100644 --- a/webapp/components/Comment.vue +++ b/webapp/components/Comment.vue @@ -84,7 +84,7 @@ export default { ` await this.$apollo.mutate({ mutation: gqlMutation, - variables: { id: this.comment.id } + variables: { id: this.comment.id }, }) this.$toast.success(this.$t(`delete.comment.success`)) this.$emit('deleteComment') @@ -92,6 +92,6 @@ export default { this.$toast.error(err.message) } }, - } + }, } diff --git a/webapp/components/ContentMenu.vue b/webapp/components/ContentMenu.vue index bee5ca011..a8b4db02f 100644 --- a/webapp/components/ContentMenu.vue +++ b/webapp/components/ContentMenu.vue @@ -59,7 +59,7 @@ export default { required: true, validator: value => { return value.match(/(contribution|comment|organization|user)/) - } + }, }, callbacks: { type: Object, required: true }, }, @@ -101,7 +101,7 @@ export default { callback: () => { this.openModal('delete') }, - icon: 'trash' + icon: 'trash', }) } @@ -153,8 +153,8 @@ export default { data: { type: this.resourceType, resource: this.resource, - callbacks: this.callbacks - } + callbacks: this.callbacks, + }, }) }, }, diff --git a/webapp/components/Modal/DeleteModal.spec.js b/webapp/components/Modal/DeleteModal.spec.js index 0b01c3647..8fd250e19 100644 --- a/webapp/components/Modal/DeleteModal.spec.js +++ b/webapp/components/Modal/DeleteModal.spec.js @@ -24,7 +24,7 @@ describe('DeleteModal.vue', () => { id: 'p23', callbacks: { confirm: () => Post.methods.deletePostCallback('list'), - cancel: null + cancel: null, }, } mocks = { @@ -65,7 +65,7 @@ describe('DeleteModal.vue', () => { name: 'It is a post', callbacks: { confirm: () => Post.methods.deletePostCallback('list'), - cancel: null + cancel: null, }, } }) @@ -73,9 +73,7 @@ describe('DeleteModal.vue', () => { it('mentions post title', () => { Wrapper() const calls = mocks.$t.mock.calls - const expected = [ - ['delete.contribution.message', { name: 'It is a post' }] - ] + const expected = [['delete.contribution.message', { name: 'It is a post' }]] expect(calls).toEqual(expect.arrayContaining(expected)) }) }) @@ -88,17 +86,15 @@ describe('DeleteModal.vue', () => { name: 'It is the user of the comment', callbacks: { confirm: () => Post.methods.deletePostCallback('list'), - cancel: null - } + cancel: null, + }, } }) it('mentions comments user name', () => { Wrapper() const calls = mocks.$t.mock.calls - const expected = [ - ['delete.comment.message', { name: 'It is the user of the comment' }] - ] + const expected = [['delete.comment.message', { name: 'It is the user of the comment' }]] expect(calls).toEqual(expect.arrayContaining(expected)) }) }) @@ -122,7 +118,7 @@ describe('DeleteModal.vue', () => { id: 'p23', callbacks: { confirm: () => Post.methods.deletePostCallback('list'), - cancel: null + cancel: null, }, } wrapper = Wrapper() @@ -195,8 +191,8 @@ describe('DeleteModal.vue', () => { id: 'c3', callbacks: { confirm: () => Post.methods.deletePostCallback('list'), - cancel: null - } + cancel: null, + }, } wrapper = Wrapper() }) diff --git a/webapp/components/Modal/DeleteModal.vue b/webapp/components/Modal/DeleteModal.vue index 883dc28d8..ef542973b 100644 --- a/webapp/components/Modal/DeleteModal.vue +++ b/webapp/components/Modal/DeleteModal.vue @@ -74,7 +74,7 @@ export default { }, methods: { async cancel() { - if (!!this.callbacks.cancel) { + if (this.callbacks.cancel) { await this.callbacks.cancel() } this.isOpen = false @@ -85,7 +85,7 @@ export default { async confirm() { this.loading = true try { - if (!!this.callbacks.confirm) { + if (this.callbacks.confirm) { await this.callbacks.confirm() } this.success = true diff --git a/webapp/components/Modal/DisableModal.vue b/webapp/components/Modal/DisableModal.vue index c2d3d64a4..fe9921511 100644 --- a/webapp/components/Modal/DisableModal.vue +++ b/webapp/components/Modal/DisableModal.vue @@ -55,7 +55,7 @@ export default { }, methods: { async cancel() { - if (!!this.callbacks.cancel) { + if (this.callbacks.cancel) { await this.callbacks.cancel() } this.isOpen = false @@ -65,7 +65,7 @@ export default { }, async confirm() { try { - if (!!this.callbacks.confirm) { + if (this.callbacks.confirm) { await this.callbacks.confirm() } await this.$apollo.mutate({ diff --git a/webapp/components/Modal/ReportModal.vue b/webapp/components/Modal/ReportModal.vue index 2fa85967f..1d99bead1 100644 --- a/webapp/components/Modal/ReportModal.vue +++ b/webapp/components/Modal/ReportModal.vue @@ -74,7 +74,7 @@ export default { }, methods: { async cancel() { - if (!!this.callbacks.cancel) { + if (this.callbacks.cancel) { await this.callbacks.cancel() } this.isOpen = false @@ -85,7 +85,7 @@ export default { async confirm() { this.loading = true try { - if (!!this.callbacks.confirm) { + if (this.callbacks.confirm) { await this.callbacks.confirm() } await this.$apollo.mutate({ diff --git a/webapp/components/PostCard/index.vue b/webapp/components/PostCard/index.vue index b5f7e5e9b..7a6f5da89 100644 --- a/webapp/components/PostCard/index.vue +++ b/webapp/components/PostCard/index.vue @@ -1,16 +1,16 @@ - +