Skip to content

Commit 6f4b246

Browse files
committed
OpenConceptLab/ocl_issues#2307 | search to use lookup if defined
1 parent 05cb4ec commit 6f4b246

1 file changed

Lines changed: 17 additions & 10 deletions

File tree

src/components/map-projects/MapProject.jsx

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2288,18 +2288,25 @@ const MapProject = () => {
22882288
return find(keys(conceptCache), url => url === id || url.endsWith(`/concepts/${id}/`) || url.endsWith(`/concepts/${encodeURIComponent(id)}/`)) || false
22892289
}
22902290

2291+
const getLookupService = () => {
2292+
let service = APIService.new()
2293+
if(lookupConfig?.url) {
2294+
if(lookupConfig.url.startsWith('http'))
2295+
service.URL = lookupConfig.url
2296+
else
2297+
service.overrideURL(lookupConfig.url)
2298+
} else {
2299+
service.overrideURL(repoVersion.version_url)
2300+
}
2301+
return service.appendToUrl('concepts/')
2302+
}
2303+
22912304
const lookupCode = (code) => {
22922305
if (getKeyFromCache(code))
22932306
return
22942307
if(code && (lookupConfig?.url || repoVersion?.version_url)) {
2295-
let service = APIService.new()
2296-
if(lookupConfig?.url) {
2297-
service.URL = lookupConfig.url
2298-
} else {
2299-
service.overrideURL(repoVersion.version_url)
2300-
}
2301-
2302-
service.appendToUrl(`concepts/${code}/`).get(lookupConfig?.token).then(response => {
2308+
let service = getLookupService()
2309+
service.appendToUrl(`${code}/`).get(lookupConfig?.token).then(response => {
23032310
if(response?.data?.url)
23042311
setConceptCache(prev => ({...prev, [response.data.url]: response.data}))
23052312
})
@@ -2316,7 +2323,7 @@ const MapProject = () => {
23162323
if(!searchStr)
23172324
return
23182325
setIsLoadingInDecisionView(true)
2319-
APIService.new().overrideURL(repoVersion.version_url).appendToUrl('concepts/').get(null, null, {
2326+
getLookupService().get(lookupConfig?.token, null, {
23202327
includeSearchMeta: true,
23212328
includeMappings: true,
23222329
mappingBrief: true,
@@ -2344,7 +2351,7 @@ const MapProject = () => {
23442351
}
23452352

23462353
const getFacets = (firstLoad, rowIndex) => {
2347-
APIService.new().overrideURL(repoVersion.version_url).appendToUrl('concepts/').get(null, null, {
2354+
getLookupService().get(lookupConfig?.token, null, {
23482355
q: firstLoad ? '' : searchStr,
23492356
includeRetired: retired,
23502357
facetsOnly: true

0 commit comments

Comments
 (0)