From fda6f683d45976d635364c1e12a2a96bb8e95d6a Mon Sep 17 00:00:00 2001 From: mattwr18 Date: Wed, 23 Oct 2019 09:41:31 +0200 Subject: [PATCH 1/2] Update fetchMore functionality on profile page - clean up from pinned Posts PR --- webapp/pages/profile/_id/_slug.vue | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/webapp/pages/profile/_id/_slug.vue b/webapp/pages/profile/_id/_slug.vue index 301d504aa..86ff4066a 100644 --- a/webapp/pages/profile/_id/_slug.vue +++ b/webapp/pages/profile/_id/_slug.vue @@ -376,7 +376,7 @@ export default { return uniqBy(items, field) }, showMoreContributions() { - const { Post: PostQuery } = this.$apollo.queries + const { profilePagePosts: PostQuery } = this.$apollo.queries if (!PostQuery) return // seems this can be undefined on subpages this.offset += this.pageSize @@ -388,11 +388,14 @@ export default { orderBy: 'createdAt_desc', }, updateQuery: (previousResult, { fetchMoreResult }) => { - if (!fetchMoreResult || fetchMoreResult.Post.length < this.pageSize) { + if (!fetchMoreResult || fetchMoreResult.profilePagePosts.length < this.pageSize) { this.hasMore = false } const result = Object.assign({}, previousResult, { - Post: [...previousResult.Post, ...fetchMoreResult.Post], + profilePagePosts: [ + ...previousResult.profilePagePosts, + ...fetchMoreResult.profilePagePosts, + ], }) return result }, @@ -464,7 +467,7 @@ export default { }, }, apollo: { - Post: { + profilePagePosts: { query() { return profilePagePosts(this.$i18n) }, From 44e54372c4148fafae1095d172d1a52a87b3b1b2 Mon Sep 17 00:00:00 2001 From: mattwr18 Date: Wed, 23 Oct 2019 10:51:41 +0200 Subject: [PATCH 2/2] Fix block user workflow - need to update all the smart queries naming --- webapp/pages/profile/_id/_slug.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/webapp/pages/profile/_id/_slug.vue b/webapp/pages/profile/_id/_slug.vue index 86ff4066a..d56aec446 100644 --- a/webapp/pages/profile/_id/_slug.vue +++ b/webapp/pages/profile/_id/_slug.vue @@ -410,13 +410,13 @@ export default { await this.$apollo.mutate({ mutation: Block(), variables: { id: user.id } }) this.$apollo.queries.User.refetch() this.resetPostList() - this.$apollo.queries.Post.refetch() + this.$apollo.queries.profilePagePosts.refetch() }, async unblock(user) { await this.$apollo.mutate({ mutation: Unblock(), variables: { id: user.id } }) this.$apollo.queries.User.refetch() this.resetPostList() - this.$apollo.queries.Post.refetch() + this.$apollo.queries.profilePagePosts.refetch() }, pinPost(post) { this.$apollo @@ -427,7 +427,7 @@ export default { .then(() => { this.$toast.success(this.$t('post.menu.pinnedSuccessfully')) this.resetPostList() - this.$apollo.queries.Post.refetch() + this.$apollo.queries.profilePagePosts.refetch() }) .catch(error => this.$toast.error(error.message)) }, @@ -440,7 +440,7 @@ export default { .then(() => { this.$toast.success(this.$t('post.menu.unpinnedSuccessfully')) this.resetPostList() - this.$apollo.queries.Post.refetch() + this.$apollo.queries.profilePagePosts.refetch() }) .catch(error => this.$toast.error(error.message)) },