From 67876120710097fe0a9dc13893ba9d09560a91db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 29 Nov 2023 13:28:50 +0100
Subject: [PATCH] Take into account case when there are no active news

---
 .../vuejs/HomepageWidget/DashboardWidgets/News.vue   | 12 +++++++-----
 .../public/vuejs/HomepageWidget/MyCustoms.vue        |  4 ++--
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/DashboardWidgets/News.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/DashboardWidgets/News.vue
index a33bebf5c..6f85a5678 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/DashboardWidgets/News.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/DashboardWidgets/News.vue
@@ -1,5 +1,5 @@
 <template>
-    <div>
+    <div v-if="newsItems.length > 0">
         <h1>{{ $t('widget.news.title') }}</h1>
         <ul class="scrollable">
             <NewsItem v-for="item in newsItems" :item="item" :key="item.id" />
@@ -9,7 +9,7 @@
 
 <script setup lang="ts">
 import { onMounted, ref } from 'vue'
-import { makeFetch } from '../../../lib/api/apiMethods';
+import { fetchResults } from '../../../lib/api/apiMethods';
 import Modal from '../../_components/Modal.vue';
 import { NewsItemType } from '../../../types';
 import NewsItem from './NewsItem.vue';
@@ -17,10 +17,12 @@ import NewsItem from './NewsItem.vue';
 const newsItems = ref<NewsItemType[]>([])
 
 onMounted(() => {
-    makeFetch('GET', '/api/1.0/main/news.json')
-        .then((response: { results: NewsItemType[] }) => {
+    fetchResults<NewsItemType>('/api/1.0/main/news/current.json')
+        .then((news): Promise<void> => {
             // console.log('news articles', response.results)
-            newsItems.value = response.results
+            newsItems.value = news;
+
+            return Promise.resolve();
         })
         .catch((error: string) => {
             console.error('Error fetching news items', error);
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyCustoms.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyCustoms.vue
index 58120e5cf..cc50715f1 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyCustoms.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyCustoms.vue
@@ -40,9 +40,9 @@
       </div>
 
        <div class="mbloc col col-lg-12 col-lg-4" v-if="this.dashboardItems">
-           <div v-for="dashboardItem in this.dashboardItems">
+           <template v-for="dashboardItem in this.dashboardItems">
                <News v-if="dashboardItem.type === 'news'"/>
-           </div>
+           </template>
        </div>
 
    </div>