fix(Posts): invert order when displaying comments

jkklapp · Jun 9, 2022 · f359b62 · f359b62
1 parent 2be4ee0
commit f359b62
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 16 deletions.
diff --git a/backend/src/posts/posts.service.ts b/backend/src/posts/posts.service.ts
@@ -56,9 +56,10 @@ export class PostsService {
   ): Promise<PaginatedResults> {
     const _startAfter = startAfter ? parseInt(startAfter, 10) : '';
     const noMoreResults = startAfter ? -1 : null;
-    return this.postsCollection
-      .orderBy('date', 'desc')
-      .startAfter(_startAfter)
+    const query = parentId
+      ? this.postsCollection.orderBy('date').endBefore(_startAfter)
+      : this.postsCollection.orderBy('date', 'desc').startAfter(_startAfter);
+    return query
       .limit(limit)
       .get()
       .then(async (snapshot) => {
@@ -68,7 +69,7 @@ export class PostsService {
             ...doc.data(),
           }))
           .filter((post) => {
-            return post.parentId === parentId;
+            return post.parentId === parentId || post.id === parentId;
           });
         const q = await snapshot.query.offset(limit).get();
 

diff --git a/frontend/src/components/Dashboard/Posts.vue b/frontend/src/components/Dashboard/Posts.vue
@@ -52,11 +52,6 @@ export default {
   components: {
     Post,
   },
-  async beforeRouteEnter(to, from) {
-    // react to route changes...
-    this.fetchPosts(to.params.parentId);
-  },
-
   computed: {
     ...mapGetters({
       posts: 'getPosts',
@@ -68,7 +63,7 @@ export default {
   created() {
     this.$watch(
       () => this.$route.params,
-      ({ parentId }, previousParams) => {
+      ({ parentId }) => {
         if (
           this.$route.name === 'Dashboard' ||
           this.$route.name === 'Comments'

diff --git a/frontend/src/store/mutations.js b/frontend/src/store/mutations.js
@@ -9,12 +9,7 @@ export default {
     state.parentId = data;
   },
   SET_POSTS(state, results) {
-    if (state.parentId) {
-      const parent = state.posts.filter((post) => post.id === state.parentId);
-      state.posts = [...parent, ...results];
-    } else {
-      state.posts = results;
-    }
+    state.posts = results;
   },
   SET_POST_BY_ID(state, data) {
     const index = state.posts.findIndex((post) => post.id === data.id);