Merge pull request #10767 from cdrini/feature/partials-lang-param

mekarpeles · web-flow · commit 4e6544bfee64 · 2025-05-20T15:39:05.000-04:00
Forward ?lang param when rendering partials
diff --git a/openlibrary/plugins/openlibrary/js/affiliate-links.js b/openlibrary/plugins/openlibrary/js/affiliate-links.js
@@ -1,3 +1,5 @@
+import { buildPartialsUrl } from './utils'
+
 /**
  * Adds functionality to fetch affialite links asyncronously.
  *
@@ -49,9 +51,8 @@ function showLoadingIndicators(linkSections) {
  */
 async function getPartials(data, affiliateLinksSections) {
     const dataString = JSON.stringify(data)
-    const dataQueryParam = encodeURIComponent(dataString)
 
-    return fetch(`/partials.json?_component=AffiliateLinks&data=${dataQueryParam}`)
+    return fetch(buildPartialsUrl('/partials.json', {_component: 'AffiliateLinks', data: dataString}))
         .then((resp) => {
             if (resp.status !== 200) {
                 throw new Error(`Failed to fetch partials. Status code: ${resp.status}`)
diff --git a/openlibrary/plugins/openlibrary/js/book-page-lists.js b/openlibrary/plugins/openlibrary/js/book-page-lists.js
@@ -1,3 +1,5 @@
+import { buildPartialsUrl } from './utils'
+
 /**
  * Initializes lazy-loading the "Lists" section of Open Library book pages.
  *
@@ -61,6 +63,6 @@ async function fetchPartials(workId, editionId) {
     if (editionId) {
         params.editionId = editionId
     }
-    const searchParams = new URLSearchParams(params)
-    return fetch(`/partials.json?${searchParams.toString()}`)
+
+    return fetch(buildPartialsUrl('/partials.json', params));
 }
diff --git a/openlibrary/plugins/openlibrary/js/carousel/Carousel.js b/openlibrary/plugins/openlibrary/js/carousel/Carousel.js
@@ -1,6 +1,7 @@
 // Slick#1.6.0 is not on npm
 import 'slick-carousel';
 import '../../../../../static/css/components/carousel--js.less';
+import { buildPartialsUrl } from  '../utils.js';
 
 /**
  * @typedef {Object} CarouselConfig
@@ -142,9 +143,8 @@ export class Carousel {
     }
 
     fetchPartials() {
-        const url = new URL(`${location.origin}/partials.json`)
         const loadMore = this.loadMore
-        const params = {
+        const url = buildPartialsUrl('/partials.json', {
             _component: 'CarouselLoadMore',
             queryType: loadMore.queryType,
             q: loadMore.q,
@@ -156,8 +156,7 @@ export class Carousel {
             hasFulltextOnly: loadMore.hasFulltextOnly,
             secondaryAction: loadMore.secondaryAction,
             key: loadMore.key
-        }
-        url.search = new URLSearchParams(params).toString()
+        });
         this.appendLoadingSlide();
         $.ajax({url: url, type: 'GET'})
             .then((results) => {
diff --git a/openlibrary/plugins/openlibrary/js/check-ins/index.js b/openlibrary/plugins/openlibrary/js/check-ins/index.js
@@ -4,6 +4,7 @@
  */
 import { PersistentToast } from '../Toast'
 import { initDialogs } from '../native-dialog'
+import { buildPartialsUrl } from '../utils'
 
 /**
  * Enum for check-in event types.
@@ -587,7 +588,7 @@ function updateProgressComponent(elem, goal) {
  * @param {string} goalYear Year that the goal is set for.
  */
 function fetchProgressAndUpdateViews(yearlyGoalElems, goalYear) {
-    fetch(`/reading-goal/partials.json?year=${goalYear}`)
+    fetch(buildPartialsUrl('/reading-goal/partials.json', {year: goalYear}))
         .then((response) => {
             if (!response.ok) {
                 throw new Error('Failed to fetch progress element')
diff --git a/openlibrary/plugins/openlibrary/js/fulltext-search-suggestion.js b/openlibrary/plugins/openlibrary/js/fulltext-search-suggestion.js
@@ -1,3 +1,5 @@
+import { buildPartialsUrl } from './utils'
+
 export function initFulltextSearchSuggestion(fulltextSearchSuggestion) {
     const isLoading = showLoadingIndicators(fulltextSearchSuggestion)
     if (isLoading) {
@@ -16,8 +18,7 @@ function showLoadingIndicators(fulltextSearchSuggestion) {
     return isLoading
 }
 async function getPartials(fulltextSearchSuggestion, query) {
-    const queryParam = encodeURIComponent(query)
-    return fetch(`/partials.json?_component=FulltextSearchSuggestion&data=${queryParam}`)
+    return fetch(buildPartialsUrl('/partials.json', {_component: 'FulltextSearchSuggestion', data: query}))
         .then((resp) => {
             if (resp.status !== 200) {
                 throw new Error(`Failed to fetch partials. Status code: ${resp.status}`)
diff --git a/openlibrary/plugins/openlibrary/js/lazy-carousel.js b/openlibrary/plugins/openlibrary/js/lazy-carousel.js
@@ -1,4 +1,5 @@
 import {initialzeCarousels} from './carousel';
+import { buildPartialsUrl } from './utils';
 
 /**
  * Adds functionality that allows carousels to lazy-load when a patron
@@ -34,8 +35,7 @@ export function initLazyCarousel(elems) {
  * @returns {Promise<Response>}
  */
 async function fetchPartials(data) {
-    const searchParams = new URLSearchParams({...data, _component: 'LazyCarousel'})
-    return fetch(`/partials.json?${searchParams.toString()}`)
+    return fetch(buildPartialsUrl('/partials.json', {...data, _component: 'LazyCarousel'}))
 }
 
 /**
diff --git a/openlibrary/plugins/openlibrary/js/lists/ListService.js b/openlibrary/plugins/openlibrary/js/lists/ListService.js
@@ -3,6 +3,8 @@
  * @module lists/ListService
  */
 
+import { buildPartialsUrl } from '../utils';
+
 /**
  * Makes a POST to a `.json` endpoint.
  * @param {object} data Configurations and payload for POST request.
@@ -158,14 +160,14 @@ export function updateReadingLog(formElem, success) {
 export function fetchPartials(key, success) {
     $.ajax({
         type: 'GET',
-        url: `/lists/partials.json?key=${key}`,
+        url: buildPartialsUrl('/lists/partials.json', {key}),
         success: success
     })
 }
 
 // XXX : jsdoc
 export async function getListPartials() {
-    return await fetch('/lists/partials.json', {
+    return await fetch(buildPartialsUrl('/lists/partials.json'), {
         method: 'GET',
         headers: {
             'Content-Type': 'application/json',
diff --git a/openlibrary/plugins/openlibrary/js/search.js b/openlibrary/plugins/openlibrary/js/search.js
@@ -2,6 +2,8 @@
  * Functionalities for templates/work_search and related templates.
  */
 
+import { buildPartialsUrl } from './utils';
+
 /**
  * Displays more facets by removing the ui-helper-hidden class.
  *
@@ -129,12 +131,11 @@ function fetchPartials(param) {
         path: location.pathname,
         query: location.search
     }
-    const dataString = JSON.stringify(data)
 
-    return fetch(`/partials.json?${new URLSearchParams({
+    return fetch(buildPartialsUrl('/partials.json', {
         _component: 'SearchFacets',
-        data: dataString
-    })}`)
+        data: JSON.stringify(data),
+    }))
         .then((resp) => {
             if (!resp.ok) {
                 throw new Error(`Failed to fetch partials. Status code: ${resp.status}`)
diff --git a/openlibrary/plugins/openlibrary/js/utils.js b/openlibrary/plugins/openlibrary/js/utils.js
@@ -72,3 +72,17 @@ export function trimInputValues(param) {
         });
     });
 }
+
+export function buildPartialsUrl(path, params) {
+    const curUrl = new URL(window.location.href);
+    const url = new URL(location.origin + path);
+    if (curUrl.searchParams.has('lang')) {
+        url.searchParams.set('lang', curUrl.searchParams.get('lang'));
+    }
+
+    for (const key in params) {
+        url.searchParams.set(key, params[key]);
+    }
+
+    return url;
+}

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+import { buildPartialsUrl } from './utils'`
	`2`	`+`
`1`	`3`	`/**`
`2`	`4`	`* Initializes lazy-loading the "Lists" section of Open Library book pages.`
`3`	`5`	`*`
`@@ -61,6 +63,6 @@ async function fetchPartials(workId, editionId) {`
`61`	`63`	`if (editionId) {`
`62`	`64`	`params.editionId = editionId`
`63`	`65`	`}`
`64`		`- const searchParams = new URLSearchParams(params)`
`65`		- return fetch(`/partials.json?${searchParams.toString()}`)
	`66`	`+`
	`67`	`+ return fetch(buildPartialsUrl('/partials.json', params));`
`66`	`68`	`}`