fix(posts): load more posts with tag (cf. MR !225 )

src/app/post/components/post-list/post-list.component.ts

@@ -43,11 +43,14 @@ export class PostListComponent implements OnInit {
           ...this.selectedLocationTagSlug,
           ...this.selectedPublicTagsSlug,
         ];
+        // Reset posts
+        this.resetPosts();
         // Apply search
-        this.getPosts(this.filters);
+        this.getPosts(1, this.filters);
       } else {
         // Init default news list
         this.allPosts = [];
+        this.filters = [];
         this.postService.getPosts(1).subscribe((news) => {
           this.fillArticles(news);
         });
@@ -74,7 +77,7 @@ export class PostListComponent implements OnInit {
     this.allPosts = [...headLineTag, ..._.difference(this.allPosts, headLineTag)];
   }
 
-  public getPosts(filters?: Tag[]): void {
+  public getPosts(page: number, filters?: Tag[]): void {
     // Parse filter
     let parsedFilters = null;
     if (filters) {
@@ -87,11 +90,8 @@ export class PostListComponent implements OnInit {
       }
     }
 
-    // Reset posts
-    this.resetPosts();
-
     this.isLoading = true;
-    this.postService.getPosts(1, parsedFilters).subscribe((news) => {
+    this.postService.getPosts(page, parsedFilters).subscribe((news) => {
       this.fillArticles(news);
     });
   }
@@ -125,11 +125,15 @@ export class PostListComponent implements OnInit {
   public loadMore(): void {
     if (this.pagination && this.pagination.page < this.pagination.pages) {
       this.isLoading = true;
+      if (this.filters) {
+        this.getPosts(this.pagination.next, this.filters);
+      } else {
         this.postService.getPosts(this.pagination.next).subscribe((news) => {
           this.fillArticles(news);
         });
       }
     }
+  }
 
   // Split news on two columns on desktop mode or one column in mobile mode.
   private setNews(news: PostWithMeta): void {

src/app/post/services/post.service.ts

@@ -27,11 +27,9 @@ export class PostService {
       // 12 posts to fit new design (1 + 3 + 2 + 1 + 3 + 2)
       limit = '12';
     }
-    if (!tags) {
-      return this.http
-        .get<PostWithMeta>(`${this.baseUrl}?page=${page}&include=tags,authors&limit=${limit}`)
-        .pipe(map((item: PostWithMeta) => new PostWithMeta(item)));
-    }
+
+    let tagsFilter = '';
+    if (tags) {
       let tagsString = '';
       // Transform tab filters to string filters
       tags.forEach((tag, index) => {
@@ -40,11 +38,10 @@ export class PostService {
           tagsString += '+tags:';
         }
       });
-    return this.http
-      .get<PostWithMeta>(
-        `${this.baseUrl}?include=tags,authors&filter=tags:${encodeURIComponent(tagsString)}&limit=${limit}`
-      )
-      .pipe(map((item: PostWithMeta) => new PostWithMeta(item)));
+      tagsFilter = `&filter=tags:${encodeURIComponent(tagsString)}`;
+    }
+
+    return this.http.get<PostWithMeta>(`${this.baseUrl}?page=${page}&include=tags,authors${tagsFilter}&limit=${limit}`);
   }
 
   public getTags(): Observable<TagWithMeta> {