CORE: add condition (#353)

* CORE: add condition * lint
oacore · Nov 12, 2024 · 5b656b9 · 5b656b9
1 parent 4dd776d
commit 5b656b9
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 13 deletions.
diff --git a/api/data-provider.js b/api/data-provider.js
@@ -7,8 +7,10 @@ const requestV3 = (url, ...args) => request(`${API_V3_URL}${url}`, ...args)
 
 // eslint-disable-next-line camelcase
 const fetchMetadata = async (id, search_id) => {
-  // eslint-disable-next-line camelcase
-  const { data } = await requestV3(`/data-providers/${id}?t=${search_id}`)
+  const { data } = await requestV3(
+    // eslint-disable-next-line camelcase
+    `/data-providers/${id}${search_id ? `?t=${search_id}` : ''}`
+  )
   return data
 }
 

diff --git a/api/search.js b/api/search.js
@@ -3,7 +3,13 @@ import apiRequest from './index'
 const FileDownload = require('js-file-download')
 
 export const fetchWorks = async (body) => {
-  const url = new URL(`/v3/search/works`, process.env.API_URL).href
+  // eslint-disable-next-line camelcase
+  const { search_id } = body
+  const url = new URL(
+    // eslint-disable-next-line camelcase
+    `/v3/search/works${search_id ? `?t=${search_id}` : ''}`,
+    process.env.API_URL
+  ).href
   const { data: dataWorks } = await apiRequest(url, {
     body,
     method: 'POST',

diff --git a/api/works.js b/api/works.js
@@ -2,9 +2,11 @@ import apiRequest from './index'
 
 // eslint-disable-next-line camelcase
 const fetchWork = async (id, search_id) => {
-  // eslint-disable-next-line camelcase
-  const url = new URL(`/v3/works/${id}?t=${search_id}`, process.env.API_URL)
-    .href
+  const url = new URL(
+    // eslint-disable-next-line camelcase
+    `/v3/works/${id}${search_id ? `?t=${search_id}` : ''}`,
+    process.env.API_URL
+  ).href
 
   const { data } = await apiRequest(url)
   return data

diff --git a/package-lock.json b/package-lock.json
diff --git a/pages/search/index.jsx b/pages/search/index.jsx
@@ -40,10 +40,12 @@ export const getServerSideProps = async ({ query: searchParams }) => {
       q,
       offset,
       limit,
-      t,
       exclude: ['fullText'],
       sort: sort === 'recent' ? 'recency' : sort,
     }
+
+    if (t) body.t = t
+
     try {
       const response = await fetchWorks(body)
 

diff --git a/templates/search/results.jsx b/templates/search/results.jsx
@@ -78,6 +78,7 @@ const Results = ({ works, searchId }) =>
           className={styles.searchResults}
           useLogo={!!checkBillingType()}
           searchId={searchId}
+          renderRedirectLink
           data={{
             workId: id,
             title,