Skip to content

OpenConceptLab/ocl_issues#2909 | A candidate leads with its name in the input language, and the matched name comes second #102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
snyaggarwal merged 6 commits into from
Oct 16, 2026
Merged

OpenConceptLab/ocl_issues#2909 | A candidate leads with its name in the input language, and the matched name comes second #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f5f2eae
OpenConceptLab/ocl_issues#2909 | A candidate leads with its name in t…
paynejd Oct 14, 2026
797f81a
closes OpenConceptLab/ocl_issues#2909 | The Input Language help says …
paynejd Oct 14, 2026
071ef7a
closes OpenConceptLab/ocl_issues#2909 | The grid, the row panel heade…
paynejd Oct 14, 2026
d03da8c
closes OpenConceptLab/ocl_issues#2909 | A reopened project's grid, an…
paynejd Oct 14, 2026
0bbdb05
OpenConceptLab/ocl_issues#2909 | Merge main into the candidate displa…
paynejd Oct 16, 2026
19f6eba
OpenConceptLab/ocl_issues#2909 | Cut what the simplification review f…
paynejd Oct 16, 2026
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
15 changes: 9 additions & 6 deletions src/components/map-projects/Candidates.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ import SearchResults from '../search/SearchResults';
import SearchFilters from '../search/SearchFilters'
import NoResults from '../search/NoResults';
import Mappings from './Mappings'
import Concept from './Concept'
import Concept, { localizedNameColumn } from './Concept'
import ConceptIcon from '../concepts/ConceptIcon'
import MapButton from './MapButton'
import AICandidatesAnalysis from './AICandidatesAnalysis'
Expand Down Expand Up @@ -162,7 +162,7 @@ const SubHeader = ({count, onClick, isCollapsed, header, indicatorColor, indicat
}


const CandidateList = ({rowViews, header, rowIndex, sortBy, order, openConceptPanel, showItem, isSelectedForMap, onMap, onFetchMore, bgColor, headerIndicatorIcon, bucketId, display, onDisplayChange, noToolbar, toolbarControl, repoVersion, alignToolbarLeft, rightControl, analysis, showAnalysis, openAnalysis, onCloseAnalysis, isInProgress, AIRecommendedCandidateId, AIAlternateCandidateIds, locales, scispacy, showAlgo, collapsed, onCollapse, candidatesScore, algoScoreFirst, byAlgorithm, showEmptyHeader, isFirst, targetCanonical, targetRelativeUrl, analysisPage, setAnalysisPage}) => {
const CandidateList = ({rowViews, header, rowIndex, sortBy, order, openConceptPanel, showItem, isSelectedForMap, onMap, onFetchMore, bgColor, headerIndicatorIcon, bucketId, display, onDisplayChange, noToolbar, toolbarControl, repoVersion, alignToolbarLeft, rightControl, analysis, showAnalysis, openAnalysis, onCloseAnalysis, isInProgress, AIRecommendedCandidateId, AIAlternateCandidateIds, inputLocale, locales, scispacy, showAlgo, collapsed, onCollapse, candidatesScore, algoScoreFirst, byAlgorithm, showEmptyHeader, isFirst, targetCanonical, targetRelativeUrl, analysisPage, setAnalysisPage}) => {
// Decorate rowViews so they work for BOTH renderers:
// - Table view: SearchResults/TableResults reads legacy concept fields
// (id, url, names, descriptions, source, search_meta, ...) via the
Expand Down Expand Up @@ -202,6 +202,7 @@ const CandidateList = ({rowViews, header, rowIndex, sortBy, order, openConceptPa

const getExtraColumns = () => {
let cols = [
localizedNameColumn(inputLocale, locales),
{
sortable: false,
id: 'mappings',
Expand Down Expand Up @@ -327,6 +328,7 @@ const CandidateList = ({rowViews, header, rowIndex, sortBy, order, openConceptPa
repoVersion={repoVersion}
AIRecommendedCandidateId={AIRecommendedCandidateId}
AIAlternateCandidateIds={AIAlternateCandidateIds}
inputLocale={inputLocale}
locales={locales}
notClickable={Boolean(scispacy)}
showAlgo={showAlgo}
Expand Down Expand Up @@ -377,7 +379,7 @@ const CandidateList = ({rowViews, header, rowIndex, sortBy, order, openConceptPa
// conceptCache — project-wide ConceptDefinition store, keyed by concept_key.
// algosSelected — algorithm definitions (for headers/grouping).
// (plans/unified-mapper-model.md "How the views map onto this model".)
const Candidates = ({rowIndex, rowState, conceptCache, targetCanonical, targetRelativeUrl, openConceptPanel, showItem, isSelectedForMap, onMap, onFetchMore, isLoading, candidatesScore, repoVersion, analysis, onFetchRecommendation, appliedFacets, setAppliedFacets, filters, facets, columns, defaultFilters, locales, models, selectedModel, onModelChange, promptTemplates, promptTemplate, onPromptTemplateChange, onRefreshClick, rowStage, inAIAssistantGroup, algosSelected, canSelectAIModel, capacityWait=false, throttle}) => {
const Candidates = ({rowIndex, rowState, conceptCache, targetCanonical, targetRelativeUrl, openConceptPanel, showItem, isSelectedForMap, onMap, onFetchMore, isLoading, candidatesScore, repoVersion, analysis, onFetchRecommendation, appliedFacets, setAppliedFacets, filters, facets, columns, defaultFilters, inputLocale, locales, models, selectedModel, onModelChange, promptTemplates, promptTemplate, onPromptTemplateChange, onRefreshClick, rowStage, inAIAssistantGroup, algosSelected, canSelectAIModel, capacityWait=false, throttle}) => {
const { t } = useTranslation();
const [sortBy, setSortBy] = React.useState('rerank_score')
const [groupBy, setGroupBy] = React.useState('quality')
Expand Down Expand Up @@ -460,6 +462,7 @@ const Candidates = ({rowIndex, rowState, conceptCache, targetCanonical, targetRe
repoVersion: repoVersion,
AIRecommendedCandidateId: AIRecommendedCandidateId,
AIAlternateCandidateIds: AIAlternateCandidateIds,
inputLocale: inputLocale,
locales: locales,
candidatesScore: candidatesScore,
algoScoreFirst: algoScoreFirst,
Expand Down Expand Up @@ -527,9 +530,9 @@ const Candidates = ({rowIndex, rowState, conceptCache, targetCanonical, targetRe
// key/order so the children's order tracks the parent rule. Bridge
// children don't have their own raw score; sorting by algo_score
// leaves them in insertion order via sortRowViews' -1 sentinel.
candidates: sortRowViews(views, sortBy, order).map(view => (
candidates: sortRowViews(views, sortBy, order, inputLocale).map(view => (
view.type === 'bridge' && view.bridgeChildren?.length
? { ...view, bridgeChildren: sortRowViews(view.bridgeChildren, sortBy, order) }
? { ...view, bridgeChildren: sortRowViews(view.bridgeChildren, sortBy, order, inputLocale) }
: view
))
}))
Expand Down Expand Up @@ -558,7 +561,7 @@ const Candidates = ({rowIndex, rowState, conceptCache, targetCanonical, targetRe
let available = []
let lowRanked = []
let pendingRerank = []
sortRowViews(qualityRowViews, sortBy, order).forEach(view => {
sortRowViews(qualityRowViews, sortBy, order, inputLocale).forEach(view => {
const score = view.conceptRow?.rerank_score
if(byScore) {
// Bucket on score presence first: unscored rows belong in their
Expand Down
123 changes: 67 additions & 56 deletions src/components/map-projects/Concept.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
import React from 'react'
import { useTranslation } from 'react-i18next'
import ListItemButton from '@mui/material/ListItemButton'
import ListItem from '@mui/material/ListItem'
import ListItemText from '@mui/material/ListItemText'
import Button from '@mui/material/Button'
import Chip from '@mui/material/Chip'
import Tooltip from '@mui/material/Tooltip'
import InfoOutlinedIcon from '@mui/icons-material/InfoOutlined'
import isString from 'lodash/isString'
import map from 'lodash/map'

import Retired from '../common/Retired'
import Score from './Score'
import MapButton from './MapButton'
import ConceptSummaryProperties from '../concepts/ConceptSummaryProperties'
import { conceptBelongsToTargetRepo, conceptForMapping } from './viewBuilders.js'
import { localizedDisplayName, getMatchedName } from './conceptNames.js'

// Format a contributor descriptor for the convergence tooltip:
// "via CIEL:1234 Activated partial thromboplastin time — SAME-AS"
Expand Down Expand Up @@ -42,40 +43,60 @@ export const MAP_TYPE_CHIP_SX = {
}
}

// The name the match was made on, with its locale, as a line under the name
// a concept leads with (getMatchedName). Exported for the row panel's
// Target Code header (MappingDecisionResult), whose box has a fixed height:
// `noWrap` keeps it to one line there, with the whole of it on hover.
export const MatchedName = ({ matchedName, noWrap }) => {
const { t } = useTranslation()
if(!matchedName) return null
const label = `${t('map_project.matched_name')}${matchedName.locale ? ` (${matchedName.locale})` : ''}:`
return (
<span
className='col-xs-12 padding-0'
style={{display: 'block', fontSize: '12px', ...(noWrap ? {whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis'} : {})}}
title={noWrap ? `${label} ${matchedName.html.replace(/<[^>]*>/g, '')}` : undefined}
>
{label}&nbsp;
<span className='searchable' dangerouslySetInnerHTML={{__html: matchedName.html}}/>
</span>
)
}

const getBestSynonym = (synonyms = []) => {
return synonyms
.map(text => {
const matches = [...text.matchAll(/<em>(.*?)<\/em>/g)];
const longestMatch = matches.reduce(
(a, b) => (b[1].length > a.length ? b[1] : a),
""
);

const emTag = `<em>${longestMatch}</em>`;
return {
text,
length: longestMatch.length,
isExact: text.trim() === emTag,
startsWith: text.startsWith(emTag)
};
// Table view's name column, naming each concept as the cards do: in the
// project's input language, with the name it matched on below. It changes
// only how the column renders: rows, which Map and the concept panel read,
// keep the concept's display_name.
export const localizedNameColumn = (inputLocale, locales) => ({
id: 'name',
renderer: item => {
const displayName = localizedDisplayName(item, inputLocale)
const matchedName = getMatchedName({
highlights: item.search_meta?.search_highlight,
concept: item,
displayName,
filterLocales: locales
})
.sort((a, b) => {
if (b.isExact !== a.isExact) return b.isExact ? 1 : -1; // ✅ exact ALWAYS first
if (b.length !== a.length) return b.length - a.length; // longer match
if (b.startsWith !== a.startsWith) return b.startsWith ? 1 : -1;
return 0;
})[0]?.text;
};
return (
<span>
{item.retired && <Retired style={{marginRight: '8px'}}/>} {displayName}
<MatchedName matchedName={matchedName} />
</span>
)
}
})


const Item = ({candidate, conceptDefinition, conceptRow, bridgeConceptDefinition, bridgeContributors, contributingAlgorithms, contributingAlgorithmIds, openConceptPanel, AIRecommendedCandidateId, AIAlternateCandidateIds, onMap, isSelectedForMap, noScore, repoVersion, synonymPrefix, isAIRecommended, isAIAlternate, showAlgo, candidatesScore, algoScoreFirst, placeholderMap, bridgeChild}) => {
const Item = ({candidate, conceptDefinition, conceptRow, bridgeConceptDefinition, bridgeContributors, contributingAlgorithms, contributingAlgorithmIds, openConceptPanel, AIRecommendedCandidateId, AIAlternateCandidateIds, onMap, isSelectedForMap, noScore, repoVersion, inputLocale, matchedName, isAIRecommended, isAIAlternate, showAlgo, candidatesScore, algoScoreFirst, placeholderMap, bridgeChild}) => {
const conceptToMap = conceptForMapping({candidate, conceptDefinition, conceptRow, bridgeConceptDefinition})
const idLabel = conceptDefinition?.id || conceptDefinition?.reference?.code
const sourceLabel = conceptDefinition?.source
// Each concept leads with its name in the project's input language
// (OpenConceptLab/ocl_issues#2909); the name that matched comes second.
const displayName = localizedDisplayName(conceptDefinition, inputLocale)
const mapTypeToApply = candidate?.map_type
const bridgePrefixLabel = bridgeConceptDefinition
? `${bridgeConceptDefinition.source || ''}:${bridgeConceptDefinition.id || bridgeConceptDefinition.reference?.code} ${bridgeConceptDefinition.display_name || ''}`.trim()
? `${bridgeConceptDefinition.source || ''}:${bridgeConceptDefinition.id || bridgeConceptDefinition.reference?.code} ${localizedDisplayName(bridgeConceptDefinition, inputLocale) || ''}`.trim()
: ''
// Score chip click opens the unified ConceptDetailsPanel with the Match
// Details tab focused. openConceptPanel resolves the per-concept enrichment
Expand Down Expand Up @@ -124,21 +145,14 @@ const Item = ({candidate, conceptDefinition, conceptRow, bridgeConceptDefinition
<Chip size='small' label={candidate.map_type} sx={MAP_TYPE_CHIP_SX} />
)}
<span className='searchable'>
{`${sourceLabel || ''}:${idLabel} ${conceptDefinition?.display_name || ''}`.trim()}
{`${sourceLabel || ''}:${idLabel} ${displayName || ''}`.trim()}
</span>
</>
) : (
<>
<span className='searchable'>{`${sourceLabel || ''}:${idLabel}`}</span>
<span style={{marginLeft: '4px'}} className='searchable'>
{
!bridgeConceptDefinition && synonymPrefix &&
<span className='searchable'>
<span dangerouslySetInnerHTML={{__html: synonymPrefix}}/>
<span style={{margin: '0 5px'}}>&rarr;</span>
</span>
}
{conceptDefinition?.display_name}
{displayName}
</span>
{
// Legacy algo-view path: a target row with bridge
Expand All @@ -151,8 +165,8 @@ const Item = ({candidate, conceptDefinition, conceptRow, bridgeConceptDefinition
{candidate?.map_type ? `[${candidate.map_type}]` : ''}
<span style={{margin: '0 5px'}}>&rarr;</span>
<span className='searchable'>
{conceptDefinition?.display_name
? `${sourceLabel || ''}:${idLabel} ${conceptDefinition.display_name}`
{displayName
? `${sourceLabel || ''}:${idLabel} ${displayName}`
: ''}
</span>
</span>
Expand All @@ -169,6 +183,7 @@ const Item = ({candidate, conceptDefinition, conceptRow, bridgeConceptDefinition
}
secondary={
<div className='col-xs-12 padding-0'>
{!bridgeConceptDefinition && <MatchedName matchedName={matchedName} />}
<div className='col-xs-12 padding-0'>
<ConceptSummaryProperties concept={conceptDefinition} repoVersion={repoVersion} />
</div>
Expand Down Expand Up @@ -318,7 +333,11 @@ const legacyToRowView = (legacy) => {
// Legacy callers (Target Code column, decision tables, search results)
// pass a flat concept-shape object instead — legacyToRowView wraps those
// so a single render path covers both worlds while PR3 cleanup is pending.
const Concept = ({_id, firstChild, lastChild, concept, openConceptPanel, isShown, onCardClick, onMap, isSelectedForMap, noScore, repoVersion, isAIRecommended, sx, notClickable, noSynonymPrefix, locales, showAlgo, candidatesScore, algoScoreFirst, asTarget, AIRecommendedCandidateId, AIAlternateCandidateIds, targetCanonical, targetRelativeUrl}) => {
//
// `inputLocale` is the project's input language: each concept leads with its
// name in it. `locales` is the project's name-locale filter, which hides a
// matched name in any other language.
const Concept = ({_id, firstChild, lastChild, concept, openConceptPanel, isShown, onCardClick, onMap, isSelectedForMap, noScore, repoVersion, isAIRecommended, sx, notClickable, inputLocale, locales, showAlgo, candidatesScore, algoScoreFirst, asTarget, AIRecommendedCandidateId, AIAlternateCandidateIds, targetCanonical, targetRelativeUrl}) => {
const rowView = concept?.conceptDefinition ? concept : legacyToRowView(concept)
if(!rowView?.conceptDefinition) return null
const { type, candidate, conceptDefinition, conceptRow, bridgeConceptDefinition, bridgeChildren, bridgeContributors, contributingAlgorithmIds, contributingAlgorithms } = rowView
Expand All @@ -334,20 +353,12 @@ const Concept = ({_id, firstChild, lastChild, concept, openConceptPanel, isShown
const isSelectedToShow = isShown ? isShown(idForUI) : false
const aiAlternateIds = Array.isArray(AIAlternateCandidateIds) ? AIAlternateCandidateIds : []

let synonymPrefix = ''
const highlights = candidate?.highlights
const synonymHighlight = highlights?.synonyms
const nameHighlight = highlights?.name
if(!nameHighlight?.length && synonymHighlight?.length && !noSynonymPrefix) {
let bestMatch = getBestSynonym(synonymHighlight) || synonymHighlight[0]
if(locales && bestMatch && conceptDefinition?.names) {
let raw = bestMatch.replaceAll("<em>", "").replaceAll("</em>", "")
let _locales = isString(locales) ? locales.split(',') : locales
if(_locales?.length > 0 && !_locales.includes(conceptDefinition.names.find(name => name.name.startsWith(raw))?.locale))
bestMatch = ''
}
synonymPrefix = (bestMatch || '').replaceAll('<em>', "<b className='searchable'>").replaceAll('</em>', '</b>')
}
const matchedName = getMatchedName({
highlights: candidate?.highlights,
concept: conceptDefinition,
displayName: localizedDisplayName(conceptDefinition, inputLocale),
filterLocales: locales
})

const baseProps = {
id: idForUI,
Expand All @@ -357,7 +368,8 @@ const Concept = ({_id, firstChild, lastChild, concept, openConceptPanel, isShown
lastChild: lastChild,
isSelectedToShow: isSelectedToShow,
sx: sx,
onCardClick: onCardClick
onCardClick: onCardClick,
inputLocale: inputLocale
}

if(type === 'bridge') {
Expand Down Expand Up @@ -389,7 +401,7 @@ const Concept = ({_id, firstChild, lastChild, concept, openConceptPanel, isShown
conceptDefinition={conceptDefinition}
conceptRow={conceptRow}
repoVersion={repoVersion}
synonymPrefix={synonymPrefix}
matchedName={matchedName}
openConceptPanel={openConceptPanel}
AIRecommendedCandidateId={AIRecommendedCandidateId}
AIAlternateCandidateIds={AIAlternateCandidateIds}
Expand Down Expand Up @@ -462,7 +474,6 @@ const Concept = ({_id, firstChild, lastChild, concept, openConceptPanel, isShown
conceptRow={child.conceptRow}
bridgeConceptDefinition={conceptDefinition}
repoVersion={repoVersion}
synonymPrefix={synonymPrefix}
openConceptPanel={openConceptPanel}
AIRecommendedCandidateId={AIRecommendedCandidateId}
AIAlternateCandidateIds={AIAlternateCandidateIds}
Expand Down Expand Up @@ -498,7 +509,7 @@ const Concept = ({_id, firstChild, lastChild, concept, openConceptPanel, isShown
contributingAlgorithms={contributingAlgorithms}
contributingAlgorithmIds={contributingAlgorithmIds}
repoVersion={repoVersion}
synonymPrefix={synonymPrefix}
matchedName={matchedName}
openConceptPanel={openConceptPanel}
AIRecommendedCandidateId={AIRecommendedCandidateId}
AIAlternateCandidateIds={AIAlternateCandidateIds}
Expand Down
2 changes: 1 addition & 1 deletion src/components/map-projects/ConfigurationForm.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ const ConfigurationForm = ({ project, handleFileUpload, file, owner, setOwner, n
{...params}
size='small'
label={t('map_project.input_language', 'Input Language')}
helperText={t('map_project.input_language_helper', 'Language of the input data. Determines which target-repo name locales are sent to the OCL AI Assistant.')}
helperText={t('map_project.input_language_helper', 'Language of the input data. Candidates lead with their name in this language, and it determines which target-repo name locales are sent to the OCL AI Assistant.')}
/>
)}
/>
Expand Down
Loading
Loading