From 0349140a47c67ae3b0301496e5ba4b9cb07634d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Delafontaine?=
 <clment.delafontaine@gmail.com>
Date: Tue, 1 Oct 2024 10:49:53 +0200
Subject: [PATCH 1/5] THE-1370 passage en mode recherche avancee dans l'url au
 clic sur un mot cle libre

---
 components/common/Keywords.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/common/Keywords.vue b/components/common/Keywords.vue
index 16c6354..ff11d8f 100644
--- a/components/common/Keywords.vue
+++ b/components/common/Keywords.vue
@@ -47,7 +47,7 @@
           <div role="list" aria-labelledby="mots-cles-libres" class="chip-lines v-chip-group" :class="isRtl ? 'rtl-text' : ''">
             <template v-for="keyWord in freeKeywords" :key="keyWord.keyword + forceRenderKey" :title="keyWord.keyword">
               <nuxt-link role="listitem"
-                :to="{ name: 'resultats', query: { q: keyWord.query ? keyWord.query : keyWord.keyword, domaine: 'theses' } }">
+                :to="{ name: 'resultats', query: { q: keyWord.query ? keyWord.query : keyWord.keyword, domaine: 'theses', avancee: true } }">
                 <v-chip label class="free-chip chips" tabindex="-1">
                   <span class="key-word-label">{{ keyWord.keyword }}</span>
                 </v-chip>
@@ -60,7 +60,7 @@
         <div role="list" aria-labelledby="keywords-title" v-if="mixedKeywords.length > 0" class="chip-lines v-chip-group" :class="isRtl ? 'rtl-text' : ''">
           <template v-for="keyWord in mixedKeywords" :key="keyWord.keyword + forceRenderKey" :title="keyWord.keyword">
             <nuxt-link role="listitem"
-              :to="{ name: 'resultats', query: { q: keyWord.query ? keyWord.query : keyWord.keyword, domaine: 'theses' } }">
+              :to="{ name: 'resultats', query: { q: keyWord.query ? keyWord.query : keyWord.keyword, domaine: 'theses', avancee: true } }">
               <v-chip label class="chips" :class="keyWord.type === 'sujetsRameau' ? 'rameau-chip' : 'free-chip'"
                 tabindex="-1">
                 <span class="key-word-label">{{ keyWord.keyword }}</span>

From 99e68e0016a97c626aedcbd420cc2118be32ffdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Delafontaine?=
 <clment.delafontaine@gmail.com>
Date: Tue, 1 Oct 2024 17:13:18 +0200
Subject: [PATCH 2/5] THE-1370 redefinition de la syntaxe de la requete sur les
 boutons mots cles + optimisation de la gestion des appels de useStrategyAPI

---
 components/common/Keywords.vue                |  7 ++-
 .../common/results/ResultPagination.vue       | 26 +++++++---
 components/personnes/PersonneView.vue         |  2 +-
 composables/useStrategyAPI.js                 | 49 ++++++++++++++++---
 4 files changed, 65 insertions(+), 19 deletions(-)

diff --git a/components/common/Keywords.vue b/components/common/Keywords.vue
index ff11d8f..6f7e826 100644
--- a/components/common/Keywords.vue
+++ b/components/common/Keywords.vue
@@ -47,7 +47,7 @@
           <div role="list" aria-labelledby="mots-cles-libres" class="chip-lines v-chip-group" :class="isRtl ? 'rtl-text' : ''">
             <template v-for="keyWord in freeKeywords" :key="keyWord.keyword + forceRenderKey" :title="keyWord.keyword">
               <nuxt-link role="listitem"
-                :to="{ name: 'resultats', query: { q: keyWord.query ? keyWord.query : keyWord.keyword, domaine: 'theses', avancee: true } }">
+                :to="{ name: 'resultats', query: { q: keyWord.query ? createKeywordQuery(keyWord.query) : createKeywordQuery(keyWord.keyword), domaine: 'theses', avancee: 'true' } }">
                 <v-chip label class="free-chip chips" tabindex="-1">
                   <span class="key-word-label">{{ keyWord.keyword }}</span>
                 </v-chip>
@@ -60,7 +60,7 @@
         <div role="list" aria-labelledby="keywords-title" v-if="mixedKeywords.length > 0" class="chip-lines v-chip-group" :class="isRtl ? 'rtl-text' : ''">
           <template v-for="keyWord in mixedKeywords" :key="keyWord.keyword + forceRenderKey" :title="keyWord.keyword">
             <nuxt-link role="listitem"
-              :to="{ name: 'resultats', query: { q: keyWord.query ? keyWord.query : keyWord.keyword, domaine: 'theses', avancee: true } }">
+              :to="{ name: 'resultats', query: { q: keyWord.query ? keyWord.query : keyWord.keyword, domaine: 'theses', avancee: 'true' } }">
               <v-chip label class="chips" :class="keyWord.type === 'sujetsRameau' ? 'rameau-chip' : 'free-chip'"
                 tabindex="-1">
                 <span class="key-word-label">{{ keyWord.keyword }}</span>
@@ -201,6 +201,9 @@ function showAllKeywords() {
   focusLastKeyword();
 }
 
+function createKeywordQuery(keyword) {
+  return "(sujetsLibelle:(" + keyword + ") OU sujetsRameauLibelle:(" + keyword + "))";
+}
 
 function focusLastKeyword() {
   var chipGroup = document.querySelector('.v-chip-group');
diff --git a/components/common/results/ResultPagination.vue b/components/common/results/ResultPagination.vue
index 7a8e8d1..b93ca9d 100644
--- a/components/common/results/ResultPagination.vue
+++ b/components/common/results/ResultPagination.vue
@@ -100,15 +100,18 @@ function updatePageNumberFromSortingSelect(pageNumber) {
 /**
  * Watchers
  */
-watch(currentPageNumber, (newCurrentPageNumber, previousCurrentPageNumber) => {
-  if (typeof previousCurrentPageNumber !== "undefined") {
+watch(currentPageNumber, async (newCurrentPageNumber, previousCurrentPageNumber) => {
+  if (typeof previousCurrentPageNumber !== "undefined" && newCurrentPageNumber !== previousCurrentPageNumber) {
+    await nextTick();
+    console.log("watcher currentPageNumber")
     setPageNumber(newCurrentPageNumber);
     emit("updatePage", newCurrentPageNumber);
   }
 });
 
-watch(currentShowingNumber, (newShowingNumber, previousShowingNumber) => {
-  if (typeof previousShowingNumber !== 'undefined') {
+watch(currentShowingNumber, async (newShowingNumber, previousShowingNumber) => {
+  if (typeof previousShowingNumber !== 'undefined' && newShowingNumber !== previousShowingNumber) {
+    await nextTick();
     setShowingNumber(newShowingNumber);
     setPageNumber(1);
     emit("updateShowingNumber", newShowingNumber);
@@ -119,12 +122,19 @@ watch(currentShowingNumber, (newShowingNumber, previousShowingNumber) => {
 /**
  * Watcher des autres barres de pagination
  */
-watch(() => props.currentPageNumber, () => {
-  currentPageNumber.value = props.currentPageNumber;
+watch(() => props.currentPageNumber, async () => {
+  if (currentPageNumber.value !== props.currentPageNumber) {
+    await nextTick();
+    console.log("watcher props.currentPageNumber")
+    currentPageNumber.value = props.currentPageNumber;
+  }
 });
 
-watch(() => props.currentShowingNumber, () => {
-  currentShowingNumber.value = props.currentShowingNumber;
+watch(() => props.currentShowingNumber, async () => {
+  if (currentShowingNumber.value !== props.currentShowingNumber) {
+    await nextTick();
+    currentShowingNumber.value = props.currentShowingNumber;
+  }
 });
 </script>
 
diff --git a/components/personnes/PersonneView.vue b/components/personnes/PersonneView.vue
index 071fcdc..09ebc98 100644
--- a/components/personnes/PersonneView.vue
+++ b/components/personnes/PersonneView.vue
@@ -256,7 +256,7 @@ function conversionMotClesFormatTheses(motsCles) {
       {
         keyword: elem,
         type: "sujet",
-        query: "sujetsLibelle:\"" + elem + "\" OU sujetsRameauLibelle:\"" + elem + "\""
+        query: "(sujetsLibelle:(" + elem + ") OU sujetsRameauLibelle:(" + elem + "))"
       }))
   }
   return { mapSujets: keyword };
diff --git a/composables/useStrategyAPI.js b/composables/useStrategyAPI.js
index 51db390..d618ea1 100644
--- a/composables/useStrategyAPI.js
+++ b/composables/useStrategyAPI.js
@@ -16,6 +16,8 @@ const checkedFilters = ref([]);
 const currentWorkingFacetName = ref("");
 const labelMap = ref(new Map());
 const facetsArray = ref([]);
+const isAdvanced = ref();
+let updateTimeout = null;
 
 export default function() {
 // import fonctions
@@ -43,22 +45,37 @@ export default function() {
    */
   function setPageNumber(value) {
     currentPageNumber.value = parseInt(value);
-    updateURL();
+    updateURLDebounced();
   }
 
   function setShowingNumber(value) {
     currentShowingNumber.value = parseInt(value);
-    updateURL();
+    updateURLDebounced();
   }
 
   function setSorting(value) {
     currentSorting.value = value;
-    updateURL();
+    updateURLDebounced();
   }
 
   function setDomaine(newDomain) {
     domaine.value = newDomain;
-    updateURL();
+    updateURLDebounced();
+  }
+
+  /**
+   * Permet de limiter le nombre d'appels à la méthode updateURL()
+   */
+  function updateURLDebounced() {
+    // Annule le précédent timeout si un appel est déjà en attente
+    if (updateTimeout) {
+      clearTimeout(updateTimeout);
+    }
+
+    // Planifie un nouvel appel après un délai court
+    updateTimeout = setTimeout(() => {
+      updateURL();
+    }, 300);
   }
 
   function getCurrentSorting() {
@@ -79,7 +96,7 @@ export default function() {
 
     return new Promise((resolve) => {
       currentFacets.value = parseFacetsValuesArray(objectsArray);
-      updateURL();
+      updateURLDebounced();
       checkedFilters.value = objectsArray;
       resolve();
     });
@@ -112,6 +129,21 @@ export default function() {
       const startingParameterDomaine = getURLParameter("domaine");
       const startingParameterPage = mobile.value ? 1 : parseInt(getURLParameter("page"));
       const startingParameterShowingNumber = mobile.value ? 10 : parseInt(getURLParameter("nb"));
+      const startingParameterAdvanced = getURLParameter("avancee");
+
+
+      // Comparer les paramètres actuels avec ceux existants
+      if (
+        currentSorting.value === startingParameterTri &&
+        currentFacets.value === startingParameterFiltres &&
+        query.value === startingParameterQ &&
+        domaine.value === startingParameterDomaine &&
+        currentPageNumber.value === startingParameterPage &&
+        currentShowingNumber.value === startingParameterShowingNumber &&
+        isAdvanced.value === startingParameterAdvanced
+      ) {
+        resolve(); // Ne pas mettre à jour si les paramètres sont les mêmes
+      }
 
       currentSorting.value = startingParameterTri ? startingParameterTri : "pertinence";
       currentFacets.value = startingParameterFiltres ? startingParameterFiltres : "";
@@ -119,7 +151,7 @@ export default function() {
       domaine.value = startingParameterDomaine ? startingParameterDomaine : "theses";
       currentPageNumber.value = startingParameterPage ? startingParameterPage : 1;
       currentShowingNumber.value = startingParameterShowingNumber ? startingParameterShowingNumber : 10;
-
+      isAdvanced.value = startingParameterAdvanced ? startingParameterAdvanced : false;
 
       resolve();
     });
@@ -145,8 +177,8 @@ export default function() {
     if (currentShowingNumber.value) params["nb"] = currentShowingNumber.value;
     if (currentSorting.value) params["tri"] = currentSorting.value;
     if (domaine.value) params["domaine"] = domaine.value;
-
     const isAdvanced = useState("isAdvanced");
+
     if(isAdvanced.value) {
       params["avancee"] = "true";
     }
@@ -157,6 +189,7 @@ export default function() {
   function updateURL() {
     if (router.currentRoute._value.name === "resultats") {
       const routerParams = setParameters();
+
       router.replace({
         name: "resultats",
         query: routerParams
@@ -198,7 +231,7 @@ export default function() {
    * Routes
    */
   function queryAPI() {
-    updateURL();
+    updateURLDebounced();
 
     const isAdvanced = useState("isAdvanced");
 

From 2e45ab3780d292ae2f0cff7cc7741d75a1efd563 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Delafontaine?=
 <clment.delafontaine@gmail.com>
Date: Wed, 2 Oct 2024 16:10:04 +0200
Subject: [PATCH 3/5] THE-1370 fix plus de resultats

---
 components/common/results/ResultComponents.vue | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/components/common/results/ResultComponents.vue b/components/common/results/ResultComponents.vue
index 5adb164..2b628a3 100644
--- a/components/common/results/ResultComponents.vue
+++ b/components/common/results/ResultComponents.vue
@@ -61,9 +61,10 @@
 
 <script setup>
 import { useDisplay } from "vuetify";
-import { onMounted, ref, watch } from "vue";
+import { onMounted, onBeforeUnmount, ref, watch } from "vue";
 
 const currentRoute = useRoute();
+const router = useRouter();
 const { mobile } = useDisplay();
 import { replaceAndEscape } from "../services/Common";
 const { setShowingNumber, getFacetsRequest } = useStrategyAPI();
@@ -100,6 +101,8 @@ const props = defineProps({
   }
 });
 
+const scrollPosition = ref(0);
+
 /**
  * Début gestionnaire clic
  */
@@ -115,10 +118,17 @@ const handleClick = (event) => {
 
 onMounted(() => {
   document.addEventListener("click", handleClick);
+
+  // Gestion du rachargement de page au clic sur le bouton charger plus de resultats
+  router.afterEach(() => {
+      window.scrollTo(0, scrollPosition.value);
+  })
 });
 
 onBeforeUnmount(() => {
   document.removeEventListener("click", handleClick);
+
+  router.afterEach(() => {});
 });
 
 /**
@@ -155,6 +165,7 @@ function updateShowingNumber(newValue) {
 }
 
 function addTenResultsToList() {
+  scrollPosition.value = window.scrollY;
   currentShowingNumber.value += 10;
   setShowingNumber(currentShowingNumber.value);
 }

From 92b9a79fe2016608cd3ac30390fc62ac77fd29a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Delafontaine?=
 <clment.delafontaine@gmail.com>
Date: Wed, 2 Oct 2024 16:23:39 +0200
Subject: [PATCH 4/5] THE-1370 chargement de isAdvanced depuis url et passage
 en variable globale

---
 composables/useStrategyAPI.js | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/composables/useStrategyAPI.js b/composables/useStrategyAPI.js
index d618ea1..4d6e3b4 100644
--- a/composables/useStrategyAPI.js
+++ b/composables/useStrategyAPI.js
@@ -131,7 +131,6 @@ export default function() {
       const startingParameterShowingNumber = mobile.value ? 10 : parseInt(getURLParameter("nb"));
       const startingParameterAdvanced = getURLParameter("avancee");
 
-
       // Comparer les paramètres actuels avec ceux existants
       if (
         currentSorting.value === startingParameterTri &&
@@ -177,11 +176,7 @@ export default function() {
     if (currentShowingNumber.value) params["nb"] = currentShowingNumber.value;
     if (currentSorting.value) params["tri"] = currentSorting.value;
     if (domaine.value) params["domaine"] = domaine.value;
-    const isAdvanced = useState("isAdvanced");
-
-    if(isAdvanced.value) {
-      params["avancee"] = "true";
-    }
+    if (isAdvanced.value) params["avancee"] = isAdvanced.value;
 
     return params;
   }
@@ -233,7 +228,7 @@ export default function() {
   function queryAPI() {
     updateURLDebounced();
 
-    const isAdvanced = useState("isAdvanced");
+    // const isAdvanced = useState("isAdvanced");
 
     query.value = (typeof query.value === "undefined") ? "*" : query.value;
 

From c4506f466b343736d2bf08351214159e71be9e32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Delafontaine?=
 <clment.delafontaine@gmail.com>
Date: Wed, 2 Oct 2024 17:17:20 +0200
Subject: [PATCH 5/5] THE-1370 nettoyage

---
 .../common/results/ResultPagination.vue       | 64 ++++++++-----------
 1 file changed, 26 insertions(+), 38 deletions(-)

diff --git a/components/common/results/ResultPagination.vue b/components/common/results/ResultPagination.vue
index b93ca9d..8eb7b02 100644
--- a/components/common/results/ResultPagination.vue
+++ b/components/common/results/ResultPagination.vue
@@ -55,38 +55,32 @@ const props = defineProps({
   }
 });
 
-const currentPageNumber = ref();
-const currentShowingNumber = ref();
-
-onMounted(() => {
-  currentPageNumber.value = props.currentPageNumber;
-  currentShowingNumber.value = props.currentShowingNumber;
-});
+const currentPageNumber = ref(props.currentPageNumber);
+const currentShowingNumber = ref(props.currentShowingNumber);
 
 const nbPages = computed(() => {
-  if (currentShowingNumber.value && props.nbResults) return Math.ceil(props.nbResults / currentShowingNumber.value);
-  else return 0;
+  if (currentShowingNumber.value && props.nbResults) {
+    return Math.ceil(props.nbResults / currentShowingNumber.value);
+  } else {
+    return 0;
+  }
 });
 
-
 const { xlAndUp } = useDisplay();
 
 const totalVisible = computed(() => {
-  if (nbPages.value > 10000)
-    if (xlAndUp.value) return 5;
-    else return 2;
-  else if (nbPages.value > 100)
-    if (xlAndUp.value) return 8;
-    else return 2;
-  else
-    if (xlAndUp.value) return "10";
-    else return 2;
-})
+  if (nbPages.value > 10000) {
+    return xlAndUp.value ? 5 : 2;
+  } else if (nbPages.value > 100) {
+    return xlAndUp.value ? 8 : 2;
+  } else {
+    return xlAndUp.value ? "10" : 2;
+  }
+});
 
 /**
  * Fonctions
  */
-
 function bottomScrollsToTop() {
   if (props.type === "bottom") scrollToTop();
 }
@@ -100,18 +94,15 @@ function updatePageNumberFromSortingSelect(pageNumber) {
 /**
  * Watchers
  */
-watch(currentPageNumber, async (newCurrentPageNumber, previousCurrentPageNumber) => {
-  if (typeof previousCurrentPageNumber !== "undefined" && newCurrentPageNumber !== previousCurrentPageNumber) {
-    await nextTick();
-    console.log("watcher currentPageNumber")
+watch(currentPageNumber, (newCurrentPageNumber, previousCurrentPageNumber) => {
+  if (newCurrentPageNumber !== previousCurrentPageNumber) {
     setPageNumber(newCurrentPageNumber);
     emit("updatePage", newCurrentPageNumber);
   }
 });
 
-watch(currentShowingNumber, async (newShowingNumber, previousShowingNumber) => {
-  if (typeof previousShowingNumber !== 'undefined' && newShowingNumber !== previousShowingNumber) {
-    await nextTick();
+watch(currentShowingNumber, (newShowingNumber, previousShowingNumber) => {
+  if (newShowingNumber !== previousShowingNumber) {
     setShowingNumber(newShowingNumber);
     setPageNumber(1);
     emit("updateShowingNumber", newShowingNumber);
@@ -120,20 +111,17 @@ watch(currentShowingNumber, async (newShowingNumber, previousShowingNumber) => {
 });
 
 /**
- * Watcher des autres barres de pagination
+ * Watcher pour props (éviter les updates récursifs)
  */
-watch(() => props.currentPageNumber, async () => {
-  if (currentPageNumber.value !== props.currentPageNumber) {
-    await nextTick();
-    console.log("watcher props.currentPageNumber")
-    currentPageNumber.value = props.currentPageNumber;
+watch(() => props.currentPageNumber, (newVal) => {
+  if (newVal !== currentPageNumber.value) {
+    currentPageNumber.value = newVal;
   }
 });
 
-watch(() => props.currentShowingNumber, async () => {
-  if (currentShowingNumber.value !== props.currentShowingNumber) {
-    await nextTick();
-    currentShowingNumber.value = props.currentShowingNumber;
+watch(() => props.currentShowingNumber, (newVal) => {
+  if (newVal !== currentShowingNumber.value) {
+    currentShowingNumber.value = newVal;
   }
 });
 </script>