diff --git a/web/themes/custom/caravane/assets/js/stores/content.js b/web/themes/custom/caravane/assets/js/stores/content.js index a0fc2f4..14fec4e 100644 --- a/web/themes/custom/caravane/assets/js/stores/content.js +++ b/web/themes/custom/caravane/assets/js/stores/content.js @@ -188,9 +188,10 @@ export const useContentStore = defineStore('content', { case 'gouvernance': multiItemPageArray = await getGouvernance(rawContent); break; - } + } this.content[`${this.contentType}s`] = multiItemPageArray; + } } catch (error) { this.error = 'Failed to fetch data'; diff --git a/web/themes/custom/caravane/assets/js/utils/content/contentFetchUtils.js b/web/themes/custom/caravane/assets/js/utils/content/contentFetchUtils.js index a6933ee..f4c588b 100644 --- a/web/themes/custom/caravane/assets/js/utils/content/contentFetchUtils.js +++ b/web/themes/custom/caravane/assets/js/utils/content/contentFetchUtils.js @@ -120,6 +120,8 @@ export async function getRessourceItemCard(item) { vignette = null; } } + + const relatedEtape = await REST.get(item.relationships.field_etape.links.related.href); return { ressourceType: item.attributes.field_type_de_ressource, @@ -127,6 +129,7 @@ export async function getRessourceItemCard(item) { auteurice: item.attributes.field_autheurice, date: getCleanDate(item.attributes.field_date_ressource), url: ressourceFetch.data.data.attributes.metatag.find(tag => tag.tag === "link")?.attributes.href, + relatedEtape: relatedEtape.data.data.attributes.title, vignette }; } catch (error) { diff --git a/web/themes/custom/caravane/assets/js/utils/content/multiItemPages.js b/web/themes/custom/caravane/assets/js/utils/content/multiItemPages.js index f9f267c..9b960e4 100644 --- a/web/themes/custom/caravane/assets/js/utils/content/multiItemPages.js +++ b/web/themes/custom/caravane/assets/js/utils/content/multiItemPages.js @@ -55,6 +55,8 @@ export async function getGouvernance(rawContent) { } export async function getRessources(rawContent) { + console.log(rawContent); + const ressourcesPromises = rawContent.map(item => getRessourceItemCard(item)); return await Promise.all(ressourcesPromises); diff --git a/web/themes/custom/caravane/assets/js/vuejs/components/CentreDeRessource.vue b/web/themes/custom/caravane/assets/js/vuejs/components/CentreDeRessource.vue index bf24421..41344f2 100644 --- a/web/themes/custom/caravane/assets/js/vuejs/components/CentreDeRessource.vue +++ b/web/themes/custom/caravane/assets/js/vuejs/components/CentreDeRessource.vue @@ -8,6 +8,12 @@ {{ type.replace(/_/g, ' ').replace(/^\w/, char => char.toUpperCase()) }} +
@@ -43,6 +49,7 @@