From 01aeb3fbf415a6125d2f1c79f9aa1e136ea91a3d Mon Sep 17 00:00:00 2001
From: Antoine M <antoine.martinon@deligraph.com>
Date: Thu, 19 Sep 2024 10:37:32 +0200
Subject: [PATCH] refactoring with only one news building function

---
 resources/js/archive-template-news.js | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/resources/js/archive-template-news.js b/resources/js/archive-template-news.js
index 312ad5d..f13df3f 100644
--- a/resources/js/archive-template-news.js
+++ b/resources/js/archive-template-news.js
@@ -104,19 +104,13 @@ async function hydrateNewsFeedByTypeId(filterID, termName) {
 
   let newCardsDatas;
   if (filterID === 'all') {
-    // const response = await fetch(
-    //   `/wp-json/homegrade-datas/v1/build/news/all?current-page-language=${currentLanguage}&active-page=${activePage}&posts-per-page=${postsPerPage}`
-    // );
     const response = await fetch(
-      `/wp-json/homegrade-datas/v1/build/news/more?current-page-language=${currentLanguage}&active-page=${0}&posts-per-page=${postsPerPage}`
+      `/wp-json/homegrade-datas/v1/build/news?current-page-language=${currentLanguage}&active-page=${0}&posts-per-page=${postsPerPage}`
     );
     newCardsDatas = await response.json();
   } else {
-    // const response = await fetch(
-    //   `/wp-json/homegrade-datas/v1/build/news/type/${filterID}?current-page-language=${currentLanguage}&active-page=${activePage}&posts-per-page=${postsPerPage}`
-    // );
     const response = await fetch(
-      `/wp-json/homegrade-datas/v1/build/news/more?current-page-language=${currentLanguage}&active-page=${0}&active-term-id=${filterID}&posts-per-page=${postsPerPage}`
+      `/wp-json/homegrade-datas/v1/build/news?current-page-language=${currentLanguage}&active-page=${0}&active-term-id=${filterID}&posts-per-page=${postsPerPage}`
     );
     newCardsDatas = await response.json();
   }
@@ -127,18 +121,18 @@ async function hydrateNewsFeedByTypeId(filterID, termName) {
   updateToolbarActiveFilter(filterID);
   updateSearchResultsAmount(newCardsDatas.total_posts_found, termName);
   updateHasMorePosts(newCardsDatas.active_page, newCardsDatas.max_num_pages);
-  console.log(newCardsDatas.active_page, newCardsDatas.max_num_pages);
   checkLoadMoreButtonsVisibility();
 }
 
 async function hydrateNewsFeedWithAllPosts() {
   const currentLanguage = document.querySelector('body').getAttribute('current-language');
-  const activeNewsTermId =
-    document
-      .querySelector('.filters-toolbar--archive-news')
-      .getAttribute('data-active-news-term') ?? null;
+  const filtersToolbar = document.querySelector('.filters-toolbar--archive-news');
+
+  const postsPerPage = -1;
+  const activeNewsTermId = filtersToolbar.getAttribute('data-active-news-term') ?? 'all';
+
   const response = await fetch(
-    `/wp-json/homegrade-datas/v1/build/news/all?current-page-language=${currentLanguage}`
+    `/wp-json/homegrade-datas/v1/build/news?current-page-language=${currentLanguage}&active-page=${0}&active-term-id=${activeNewsTermId}&posts-per-page=${postsPerPage}`
   );
   newsDatas = await response.json();
 
@@ -158,7 +152,7 @@ async function hydrateNewsFeedWithNextPosts() {
   const activeNewsTermId = filtersToolbar.getAttribute('data-active-news-term') ?? 'all';
 
   const response = await fetch(
-    `/wp-json/homegrade-datas/v1/build/news/more?current-page-language=${currentLanguage}&active-page=${activePage}&active-term-id=${activeNewsTermId}&posts-per-page=${postsPerPage}`
+    `/wp-json/homegrade-datas/v1/build/news?current-page-language=${currentLanguage}&active-page=${activePage}&active-term-id=${activeNewsTermId}&posts-per-page=${postsPerPage}`
   );
   newsDatas = await response.json();