Merge pull request #133 from abes-esr/THE-933-Page-personne-rendre-le…

…s-noms-des-personnes-cliquables The 933 page personne rendre les noms des personnes cliquables
abes-esr · Sep 25, 2023 · f662a24 · f662a24
2 parents 6af1f8c + 18510e8
commit f662a24
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 24 deletions.
diff --git a/src/components/theses/results/ResultCard.vue b/src/components/theses/results/ResultCard.vue
@@ -33,8 +33,8 @@
           {{ $t('resultCard.par') }}{{ '\xa0' }}
         </span>
 
-        <span v-for="(item, index) in auteur" :key="item.ppn">
-          <span :class="item.ppn ? 'clickable lightblue' : ''" @click="linkTo(item.ppn)">
+        <span v-for="(item, index) in auteur" :key="item.ppn ? item.ppn : item.id">
+          <span :class="item.ppn || item.id ? 'clickable lightblue' : ''" @click="linkTo(item.ppn ? item.ppn : item.id)">
             <span class="card-text">{{ item.prenom }}{{ '\xa0' }}</span>
             <span class="card-text">{{ item.nom }}</span>
           </span>{{ '\xa0' }}
@@ -50,8 +50,8 @@
           {{ $t('resultCard.dir') }}{{ '\xa0' }}
         </span>
 
-        <span v-for="(item, index) in directeurs" :key="item.ppn">
-          <span :class="item.ppn ? 'clickable lightblue' : ''" @click="linkTo(item.ppn)">
+        <span v-for="(item, index) in directeurs" :key="item.ppn ? item.ppn : item.id">
+          <span :class="item.ppn || item.id ? 'clickable lightblue' : ''" @click="linkTo(item.ppn ? item.ppn : item.id)">
             <span class="card-text">
               {{ item.prenom }}{{ '\xa0' }}
             </span>

diff --git a/src/services/StrategyAPI.js b/src/services/StrategyAPI.js
@@ -69,7 +69,10 @@ function setSorting(value) {
 }
 
 function setDomaine(newDomain) {
-  domaine.value = newDomain;
+  if (newDomain !== 'undefined')
+    domaine.value = newDomain;
+  else
+    domaine.value = 'theses';
   updateURL();
 }
 

diff --git a/src/views/PersonneView.vue b/src/views/PersonneView.vue
@@ -1,7 +1,7 @@
 <template>
   <Message-box ref="messageBox"></Message-box>
   <!--  Mobile-->
-  <header-mobile v-if="mobile" class="header-mobile" @changeDomain="changeDomain" @search="search" @searchAndReinitializeAllFacets="searchAndReinitializeAllFacets" @displayError="displayError"
+  <header-mobile v-if="mobile" class="header-mobile" @displayError="displayError"
                    @activateMenu="activateMenu" @activateSearchBar="activateSearchBar" @activateFilterMenu="activateFilterMenu"
                    :loading="loading" :show-menu="showMenu" :show-search-bar="showSearchBar"
   ></header-mobile>
@@ -16,7 +16,7 @@
         <h1>{{ $t("slogan") }}</h1>
       </div>
       <div class="sub_header__action">
-        <domain-selector @changeDomain="changeDomain" compact></domain-selector>
+        <domain-selector compact></domain-selector>
         <search-bar @searchAndReinitializeAllFacets="searchAndReinitializeAllFacets" :loading="loading"
                     @onError="displayError"/>
       </div>
@@ -99,7 +99,7 @@
 import {useMeta} from 'vue-meta';
 import {useI18n} from "vue-i18n";
 
-import {defineAsyncComponent, onBeforeMount, onUpdated, ref, watchEffect} from 'vue';
+import { defineAsyncComponent, onBeforeMount, onUpdated, ref, watch, watchEffect } from "vue";
 import SearchBar from '../components/generic/GenericSearchBar.vue';
 import DomainSelector from '@/components/common/DomainSelector.vue';
 
@@ -126,11 +126,6 @@ const showMenu = ref(false);
 const {t} = useI18n();
 const {meta} = useMeta({});
 
-watchEffect(() => {
-  const titlePersonne = item.value.prenom ? item.value.prenom + " " + item.value.nom : "";
-  meta.title = titlePersonne;
-  meta.description = t("meta.descPersonne") + titlePersonne;
-});
 
 const props = defineProps({
   id: {
@@ -141,7 +136,34 @@ const props = defineProps({
 
 
 onBeforeMount(() => {
+  loadData();
+});
 
+onUpdated(() => {
+  if (currentRoute.hash) {
+    document.getElementById(currentRoute.hash.substring(1))?.scrollIntoView({behavior: "smooth"});
+  }
+});
+
+const messageBox = ref(null);
+
+/**
+ * Watchers
+ */
+watchEffect(() => {
+  const titlePersonne = item.value.prenom ? item.value.prenom + " " + item.value.nom : "";
+  meta.title = titlePersonne;
+  meta.description = t("meta.descPersonne") + titlePersonne;
+});
+
+watch(() => props.id, () => {
+  loadData();
+});
+
+/**
+ * Fonctions
+ */
+function loadData() {
   dataReady.value = false;
   getPersonne(props.id).then(result => {
     item.value = result;
@@ -158,15 +180,7 @@ onBeforeMount(() => {
       displayError(error.message);
     }
   });
-});
-
-onUpdated(() => {
-  if (currentRoute.hash) {
-    document.getElementById(currentRoute.hash.substring(1))?.scrollIntoView({behavior: "smooth"});
-  }
-});
-
-const messageBox = ref(null);
+}
 
 /**
  * Retourne le nom de l'ancre HTML en fonction de la clé du rôle
@@ -459,11 +473,12 @@ function sleep(ms) {
 }
 
 .skeleton {
-  margin-bottom: 3em;
+  margin-bottom: 1em;
+  display: flex;
 }
 
 .skeleton-wrapper {
-  padding: 2em 0;
+  display: unset;
 }
 
 :deep(.v-skeleton-loader__button) {