Skip to content

PR3-C: v2-only oclmap (drop allCandidates + legacy load/save) #35

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

Draft
paynejd wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

PR3-C: v2-only oclmap (drop allCandidates + legacy load/save) #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9f8f4b3
closes OpenConceptLab/ocl_issues#2541 | PR3-C: v2-only oclmap — drop …
paynejd May 27, 2026
21f42b7
OpenConceptLab/ocl_issues#2541 | removed loadProjectContext usage
snyaggarwal May 28, 2026
7e857a5
OpenConceptLab/ocl_issues#2541 | fixing candidates load
snyaggarwal Jun 1, 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 @@ -50,6 +50,7 @@ import AIAssistantButton from './AIAssistantButton'
import {
buildAlgorithmRowViews,
buildQualityRowViews,
conceptBelongsToTargetRepo,
sortRowViews,
conceptForMapping,
resolveAICandidateID
Expand Down Expand Up @@ -193,7 +194,7 @@ const SubHeader = ({count, onClick, isCollapsed, header, indicatorColor, indicat
}


const CandidateList = ({rowViews, header, rowIndex, sortBy, order, setShowItem, showItem, setShowHighlights, 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, isCoreUser, targetCanonical, analysisPage, setAnalysisPage}) => {
const CandidateList = ({rowViews, header, rowIndex, sortBy, order, setShowItem, showItem, setShowHighlights, 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, isCoreUser, 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 @@ -223,7 +224,7 @@ const CandidateList = ({rowViews, header, rowIndex, sortBy, order, setShowItem,
// ConceptDefinition.reference.url, so the comparison is exact.
const isTargetRepoView = (view) => {
if(!targetCanonical) return true
Comment on lines 224 to 226
Copy link
Copy Markdown
Member Author

@paynejd paynejd Jun 1, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

B — stale comment + C — guard inconsistency. This comment now contradicts the code: the comparison is no longer exact — that's the whole point of conceptBelongsToTargetRepo's relative-URL fallback. And this guard checks only !targetCanonical, whereas the sibling guards in qualityRowViews, Concept.isMappable, and pickTopRowView use !targetCanonical && !targetRelativeUrl. So if canonical is ever absent but relative_url is present, the table Action column would render MapButtons on every row (including bridge intermediaries). Align both:

Suggested change
// ConceptDefinition.reference.url, so the comparison is exact.
const isTargetRepoView = (view) => {
if(!targetCanonical) return true
// ConceptDefinition.reference.url in the common case; the comparison also
// tolerates canonical drift via the OCL relative-URL fallback below.
const isTargetRepoView = (view) => {
if(!targetCanonical && !targetRelativeUrl) return true

return view?.conceptDefinition?.reference?.url === targetCanonical
return conceptBelongsToTargetRepo(view?.conceptDefinition, targetCanonical, targetRelativeUrl)
}
const results = {total: onFetchMore ? rowsForTable.length : 1, results: rowsForTable}
const isCollapsed = collapsed.includes(bucketId)
Expand Down Expand Up @@ -347,6 +348,7 @@ const CandidateList = ({rowViews, header, rowIndex, sortBy, order, setShowItem,
candidatesScore={candidatesScore}
algoScoreFirst={algoScoreFirst}
targetCanonical={targetCanonical}
targetRelativeUrl={targetRelativeUrl}
/>
}}
display={display}
Expand Down Expand Up @@ -387,7 +389,7 @@ const CandidateList = ({rowViews, header, rowIndex, sortBy, order, setShowItem,
// 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, alert, setAlert, rowState, conceptCache, targetCanonical, setShowItem, showItem, setShowHighlights, 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, isCoreUser}) => {
const Candidates = ({rowIndex, alert, setAlert, rowState, conceptCache, targetCanonical, targetRelativeUrl, setShowItem, showItem, setShowHighlights, 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, isCoreUser}) => {
const { t } = useTranslation();
const [sortBy, setSortBy] = React.useState('rerank_score')
const [groupBy, setGroupBy] = React.useState('quality')
Expand Down Expand Up @@ -451,9 +453,9 @@ const Candidates = ({rowIndex, alert, setAlert, rowState, conceptCache, targetCa
// by-algorithm browsing.
const qualityRowViews = React.useMemo(() => {
const views = buildQualityRowViews(rowState, conceptCache)
if(!targetCanonical) return views
return views.filter(v => v.conceptDefinition?.reference?.url === targetCanonical)
}, [rowState, conceptCache, targetCanonical])
if(!targetCanonical && !targetRelativeUrl) return views
return views.filter(v => conceptBelongsToTargetRepo(v.conceptDefinition, targetCanonical, targetRelativeUrl))
}, [rowState, conceptCache, targetCanonical, targetRelativeUrl])
const hasAnyView = qualityRowViews.length > 0
const isNoneLoaded = !rowState || (isEmpty(rowState.candidates) && isEmpty(rowState.algorithm_responses))
const canFetchMore = hasAnyView
Expand Down Expand Up @@ -487,6 +489,7 @@ const Candidates = ({rowIndex, alert, setAlert, rowState, conceptCache, targetCa
algoScoreFirst: algoScoreFirst,
isCoreUser: isCoreUser,
targetCanonical: targetCanonical,
targetRelativeUrl: targetRelativeUrl,
analysisPage: analysisPage,
setAnalysisPage: setAnalysisPage
}
Expand Down
7 changes: 4 additions & 3 deletions src/components/map-projects/Concept.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import Retired from '../common/Retired'
import Score from './Score'
import MapButton from './MapButton'
import ConceptSummaryProperties from '../concepts/ConceptSummaryProperties'
import { conceptForMapping } from './viewBuilders.js'
import { conceptBelongsToTargetRepo, conceptForMapping } from './viewBuilders.js'

// Format a contributor descriptor for the convergence tooltip:
// "via CIEL:1234 Activated partial thromboplastin time — SAME-AS"
Expand Down Expand Up @@ -307,7 +307,7 @@ 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, setShowHighlights, isShown, onCardClick, onMap, isSelectedForMap, noScore, repoVersion, isAIRecommended, sx, notClickable, noSynonymPrefix, locales, showAlgo, candidatesScore, algoScoreFirst, asTarget, AIRecommendedCandidateId, AIAlternateCandidateIds, targetCanonical}) => {
const Concept = ({_id, firstChild, lastChild, concept, setShowHighlights, isShown, onCardClick, onMap, isSelectedForMap, noScore, repoVersion, isAIRecommended, sx, notClickable, noSynonymPrefix, 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 @@ -316,7 +316,8 @@ const Concept = ({_id, firstChild, lastChild, concept, setShowHighlights, isShow
// mappable themselves — they're reference metadata about the cascade.
// Pass isSelectedForMap=false to Item so it renders the placeholder
// spacer instead of a MapButton.
const isMappable = !targetCanonical || conceptDefinition?.reference?.url === targetCanonical
const isMappable = (!targetCanonical && !targetRelativeUrl)
|| conceptBelongsToTargetRepo(conceptDefinition, targetCanonical, targetRelativeUrl)
const effectiveIsSelectedForMap = isMappable ? isSelectedForMap : false
const idForUI = conceptDefinition.ocl_url || conceptDefinition.id || conceptDefinition.reference?.code
const isSelectedToShow = isShown ? isShown(idForUI) : false
Expand Down
Loading