Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 17 additions & 3 deletions src/components/search/ConceptHierarchyResultsTable.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,18 @@ const getValue = (item, column) => {
return value
}

const Row = ({ item, columns, isSelected, onSelectChange, containerOnSelectChange, selectedList, level }) => {
const getVersionedChildrenURL = (item, baseURL) => {
if(!baseURL)
return item.url + 'children/'
// baseURL is like /users/foo/sources/Bar/1.0/concepts/
// item.url is like /users/foo/sources/Bar/concepts/FOOD_001/
// We need: /users/foo/sources/Bar/1.0/concepts/FOOD_001/children/
const conceptsSuffix = item.url.replace(/^.*\/concepts\//, 'concepts/').replace(/\/$/, '')
const sourcePrefix = baseURL.replace(/concepts\/.*$/, '')
return sourcePrefix + conceptsSuffix + '/children/'
}

const Row = ({ item, columns, isSelected, onSelectChange, containerOnSelectChange, selectedList, level, baseURL }) => {
const [open, setOpen] = React.useState(false);
const [children, setChildren] = React.useState([]);
const [selected, setSelected] = React.useState(isSelected);
Expand Down Expand Up @@ -77,7 +88,8 @@ const Row = ({ item, columns, isSelected, onSelectChange, containerOnSelectChang

const fetchChildren = () => {
if(!fetched) {
APIService.new().overrideURL(item.url).appendToUrl('children/').get().then(response => {
const childrenURL = getVersionedChildrenURL(item, baseURL)
APIService.new().overrideURL(childrenURL).get().then(response => {
setChildren(response.data || [])
setFetched(true)
})
Expand Down Expand Up @@ -136,6 +148,7 @@ const Row = ({ item, columns, isSelected, onSelectChange, containerOnSelectChang
containerOnSelectChange={containerOnSelectChange}
columns={columns}
level={level + 1}
baseURL={baseURL}
/>
))
)
Expand All @@ -152,7 +165,7 @@ const Row = ({ item, columns, isSelected, onSelectChange, containerOnSelectChang

const ConceptHierarchyResultsTable = ({
results, onPageChange, onSelect, onSelectChange, viewFields,
onCreateSimilarClick, onCreateMappingClick
onCreateSimilarClick, onCreateMappingClick, baseURL
}) => {
const [selectedList, setSelectedList] = React.useState([]);
const resourceDefinition = CONCEPTS_DEFINITION;
Expand Down Expand Up @@ -236,6 +249,7 @@ const ConceptHierarchyResultsTable = ({
containerOnSelectChange={onSelectChange}
columns={columns}
level={0}
baseURL={baseURL}
/>
))
}
Expand Down
1 change: 1 addition & 0 deletions src/components/search/Search.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -937,6 +937,7 @@ class Search extends React.Component {
onCreateMappingClick={onCreateMappingClick}
viewFields={viewFields}
onSelect={onSelect}
baseURL={this.prepareBaseURL()}
/> : (
isTable ?
<ResultsTable
Expand Down
Loading