Merge branch 'develop' of github.com:abes-esr/theses-front into THE-8…

…96-personnes-mise-en-commun-du-composant-de-mots-cles
abes-esr · Jul 13, 2023 · 9874537 · 9874537
2 parents 1dc9e31 + 61d937e
commit 9874537
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 9 deletions.
diff --git a/src/components/common/results/ResultComponents.vue b/src/components/common/results/ResultComponents.vue
@@ -60,7 +60,7 @@ import SortingSelect from "@/components/common/results/SortingSelect.vue";
 
 const currentRoute = useRoute();
 const { mobile } = useDisplay();
-const { setShowingNumber } = APIService();
+const { setShowingNumber, setShowingNumberMobile } = APIService();
 
 const props = defineProps({
   result: {
@@ -125,7 +125,7 @@ function updateShowingNumber(newValue) {
 
 function addTenResultsToList() {
   currentShowingNumber.value += 10;
-  setShowingNumber(currentShowingNumber.value);
+  setShowingNumberMobile(currentShowingNumber.value);
 }
 
 function updatePage(newPage) {

diff --git a/src/router/index.js b/src/router/index.js
@@ -1,8 +1,6 @@
 import { createRouter, createWebHistory } from "vue-router";
 const HomeView = () => import("../views/HomeView.vue")
 const ResultView = () => import("../views/ResultView.vue")
-const TheseView = () => import("../views/TheseView.vue")
-const PersonneView = () => import("../views/PersonneView.vue")
 const DetailView = () => import("../views/DetailView.vue")
 const APropos = () => import("../components/footer-pages/APropos.vue")
 const AccessibilitePage = () => import("../components/footer-pages/AccessibilitePage.vue")
@@ -56,6 +54,9 @@ export const router = createRouter({
       component: MentionsPage
     }
   ],
+  scrollBehavior() {
+    return { top: 0, left: 0 }
+  }
 });
 
 export default router;
diff --git a/src/services/StrategyAPI.js b/src/services/StrategyAPI.js
@@ -5,7 +5,6 @@ import { thesesAPIService } from "@/services/ThesesAPI";
 import { personnesAPIService } from "@/services/PersonnesAPI";
 import { referentielsAPIService } from "@/services/ReferentielsAPI";
 import { replaceAndEscape } from "@/services/Common";
-import {useRoute} from "vue-router";
 
 // import fonctions
 const { fetchCodeLangues, createLabels, getLabelFromCode } = referentielsAPIService();
@@ -51,6 +50,10 @@ function setShowingNumber(value) {
   updateURL();
 }
 
+function setShowingNumberMobile(value) {
+  currentShowingNumber.value = parseInt(value);
+}
+
 function getCurrentShowingNumber() {
   if(typeof currentShowingNumber.value !== 'undefined') {
     return parseInt(currentShowingNumber.value);
@@ -81,7 +84,6 @@ function getCurrentSorting() {
 
 function setQuery(newQuery) {
   query.value = (typeof newQuery !== 'undefined' && newQuery !== '') ? newQuery : '*';
-  updateURL();
 }
 
 function setCheckedFilters(objectsArray) {
@@ -196,9 +198,13 @@ function disableOrFilters() {
 /**
  * Routes
  */
-function queryAPI() {
+function queryAPI(mobile) {
   query.value = (typeof query.value === 'undefined') ? '*' : query.value;
 
+  if (!mobile._object.mobile) {
+    updateURL();
+  }
+
   if(domaine.value === "personnes")
     return queryPersonnesAPI(replaceAndEscape(query.value), getFacetsRequest(), currentPageNumber.value, currentShowingNumber.value, currentSorting.value);
   else
@@ -542,6 +548,7 @@ export function APIService() {
     setWorkingFacetName,
     addToFiltersLabelsMap,
     getTriMap,
-    reinitializeResultData
+    reinitializeResultData,
+    setShowingNumberMobile
   };
 }
diff --git a/src/views/ResultView.vue b/src/views/ResultView.vue
@@ -142,7 +142,7 @@ async function search(firstLoad = false) {
   /**
    * Chargement des donnees
    */
-  return queryAPI().then((response) => {
+  return queryAPI(mobile).then((response) => {
     if (!["theses", "personnes"].includes(currentRoute.query.domaine)) {
       throw new Error("Erreur de nom de paramètres");
     }