From 19d62a23f16c94a3ae5e844052bf67463b74e7d4 Mon Sep 17 00:00:00 2001 From: Jonathan Payne Date: Tue, 10 Nov 2026 16:24:17 -0500 Subject: [PATCH 1/3] closes OpenConceptLab/ocl_issues#3021 | History lists each version under the repo version that has it The History tab treated the last item of its repo version list as HEAD and filed every version it couldn't place there. Inside a repo page that list was RepoHome's first page of 10 versions (or a collection's versions), and on its own it was the API's default page of 25, so for a source with more versions, concepts and mappings only in HEAD showed under an old version, and every listed version showed even when empty. - historyGroups.js groups versions by repo version from each version's own source_versions, finds HEAD by id, and doesn't rely on the list being complete or of the right repo. - ConceptHome and MappingHome load every version of the resource's own source (limit 1000), once per source, instead of taking RepoHome's page. - Repo versions with nothing under them are left out, and "created on" falls back to created_at. Co-Authored-By: Claude Opus 5.5 --- src/components/concepts/ConceptHome.jsx | 26 ++--- src/components/concepts/History.jsx | 51 ++------- .../concepts/__tests__/historyGroups.test.js | 101 ++++++++++++++++++ src/components/concepts/historyGroups.js | 86 +++++++++++++++ src/components/mappings/MappingHome.jsx | 27 ++--- src/components/repos/RepoHome.jsx | 4 +- 6 files changed, 224 insertions(+), 71 deletions(-) create mode 100644 src/components/concepts/__tests__/historyGroups.test.js create mode 100644 src/components/concepts/historyGroups.js diff --git a/src/components/concepts/ConceptHome.jsx b/src/components/concepts/ConceptHome.jsx index 35109a800..3b332e12c 100644 --- a/src/components/concepts/ConceptHome.jsx +++ b/src/components/concepts/ConceptHome.jsx @@ -36,7 +36,7 @@ const ConceptHome = props => { const [versions, setVersions] = React.useState([]) const [repo, setRepo] = React.useState(props.repo || {}) - const [repoVersions, setRepoVersions] = React.useState(props.repoVersions || []) + const [repoVersions, setRepoVersions] = React.useState({url: null, versions: []}) const [tab, setTab] = React.useState('metadata') const [edit, setEdit] = React.useState(false) const [createSimilar, setCreateSimilar] = React.useState(false) @@ -142,22 +142,22 @@ const ConceptHome = props => { const service = APIService.new().overrideURL(_conceptURL) service.appendToUrl('versions/').get(null, null, {includeCollectionVersions: true, includeSourceVersions: true}).then(response => { setVersions(response.data || []) - if(!repoVersions?.length) - fetchRepoVersions(_conceptURL) - else - setLoading(false) + fetchRepoVersions(_conceptURL) }) } } + // History needs every version of the concept's own source, not a page of the repo being viewed const fetchRepoVersions = conceptURL => { - if(repoVersions.length === 0 && conceptURL) { - let url = dropVersion(toParentURI(conceptURL)) - APIService.new().overrideURL(url).appendToUrl('versions/').get().then(response => { - setRepoVersions(response.data || []) - setLoading(false) - }) - } else setLoading(false) + const url = dropVersion(toParentURI(conceptURL)) + if(url === repoVersions.url) { + setLoading(false) + return + } + APIService.new().overrideURL(url).appendToUrl('versions/').get(null, null, {limit: 1000}).then(response => { + setRepoVersions({url, versions: response.data || []}) + setLoading(false) + }) } const onTabChange = newTab => { @@ -420,7 +420,7 @@ const ConceptHome = props => { { tab === 'history' && { const url = repoVersion.version_url + resource + '/' + version.id + '/' @@ -125,44 +124,7 @@ const History = ({ versions, repoVersions, loading, icon, resource }) => { setSelectedVersion(false) setSelectedRepoVersion(false) } - const getRepoDetails = uri => { - const parts = compact(uri.split('/')) - return { - ownerType: parts[0], - owner: parts[1], - type: parts[2] === 'sources' ? 'Source Version' : (parts[2] === 'collections' ? 'Collection Version' : parts[2]), - id: parts[3], - version: parts[4], - uri: uri, - version_url: uri - } - } - const getVersions = () => { - let result = [] - let traversed = [] - repoVersions.forEach(repoVersion => { - const versionCreatedAt = moment(repoVersion.created_on || repoVersion.created_at) - repoVersion.resourceVersions = [] - versions.forEach(version => { - if(!traversed.includes(version.uuid)) { - const resourceVersionCreatedAt = moment(version.version_created_on) - if((version.source_versions.includes(repoVersion.version_url)) || (resourceVersionCreatedAt.isBefore(versionCreatedAt) && !version.source_versions.length)) { - repoVersion.resourceVersions.push(version) - traversed.push(version.uuid) - } - } - }) - repoVersion.resourceVersions = sortResourceVersions(repoVersion.resourceVersions) - result.push(repoVersion) - }) - const headVersion = result[repoVersions.length - 1] - if(traversed.length !== versions.length && headVersion?.id) { - headVersion.resourceVersions = sortResourceVersions([...headVersion.resourceVersions, ...versions.filter(version => !traversed.includes(version.uuid))]) - } - return compact([headVersion, ...result.filter(version=> version.id !== 'HEAD')]) - } - const sortResourceVersions = resourceVersions => orderBy(uniqBy(resourceVersions, 'version_url'), version => moment(version.version_created_on), 'desc') - let mergedVersions = getVersions() + const mergedVersions = groupVersionsByRepoVersion(versions, repoVersions) return ( @@ -270,7 +232,10 @@ const History = ({ versions, repoVersions, loading, icon, resource }) => { {t('repo.repo_version')} - {t('common.created_on').toLowerCase()} {moment(repoVersion.created_on).format('L')} + { + (repoVersion.created_on || repoVersion.created_at) && + <>{t('common.created_on').toLowerCase()} {moment(repoVersion.created_on || repoVersion.created_at).format('L')} + } { @@ -322,7 +287,7 @@ const History = ({ versions, repoVersions, loading, icon, resource }) => { { map(version.source_versions, repoVersion => { - const repo = getRepoDetails(repoVersion) + const repo = toRepoVersion(repoVersion) return ( ) @@ -343,7 +308,7 @@ const History = ({ versions, repoVersions, loading, icon, resource }) => { { map(version.collection_versions, repoVersion => { - const repo = getRepoDetails(repoVersion) + const repo = toRepoVersion(repoVersion) return ( ) diff --git a/src/components/concepts/__tests__/historyGroups.test.js b/src/components/concepts/__tests__/historyGroups.test.js new file mode 100644 index 000000000..baa04bcbe --- /dev/null +++ b/src/components/concepts/__tests__/historyGroups.test.js @@ -0,0 +1,101 @@ +import test from 'node:test' +import assert from 'node:assert/strict' + +import { groupVersionsByRepoVersion, isHead, toRepoVersion } from '../historyGroups.js' + +const SOURCE = '/orgs/MyOrg/sources/MySource/' + +const repoVersion = (version, createdAt) => ({ + id: version, version, short_code: 'MySource', type: 'Source Version', version_url: `${SOURCE}${version}/`, created_at: createdAt +}) +const HEAD = {id: 'HEAD', version: 'HEAD', short_code: 'MySource', type: 'Source Version', version_url: SOURCE, created_at: '2021-03-29T00:00:00Z'} + +// newest first, HEAD last, as the API lists them +const ALL = [ + repoVersion('v4', '2026-10-23T00:00:00Z'), + repoVersion('v3', '2026-09-24T00:00:00Z'), + repoVersion('v2', '2026-08-24T00:00:00Z'), + repoVersion('v1', '2026-07-20T00:00:00Z'), + HEAD +] + +const version = (id, createdOn, sourceVersions = [], isLatest = false) => ({ + uuid: id, + version_url: `${SOURCE}concepts/C1/${id}/`, + version_created_on: createdOn, + is_latest_version: isLatest, + source_versions: sourceVersions.map(v => `${SOURCE}${v}/`) +}) + +const summary = groups => groups.map(group => [group.version, group.resourceVersions.map(v => v.uuid)]) + +test('versions only in HEAD are listed under HEAD, not under the last repo version of a page', () => { + const versions = [ + version('3', '2026-11-07T18:00:00Z', [], true), + version('2', '2026-11-07T00:00:00Z'), + version('1', '2026-10-29T00:00:00Z') + ] + const firstPage = ALL.slice(0, 2) + assert.deepEqual(summary(groupVersionsByRepoVersion(versions, firstPage)), [['HEAD', ['3', '2', '1']]]) + assert.deepEqual(summary(groupVersionsByRepoVersion(versions, ALL)), [['HEAD', ['3', '2', '1']]]) +}) + +test('a version goes under the newest repo version that contains it', () => { + const versions = [ + version('2', '2026-09-01T00:00:00Z', ['v3', 'v4'], true), + version('1', '2026-07-01T00:00:00Z', ['v1', 'v2']) + ] + assert.deepEqual(summary(groupVersionsByRepoVersion(versions, ALL)), [['v4', ['2']], ['v2', ['1']]]) +}) + +test('an earlier version no repo version contains goes under the first repo version created after it', () => { + const versions = [ + version('3', '2026-11-01T00:00:00Z', [], true), + version('2', '2026-09-01T00:00:00Z', ['v3', 'v4']), + version('1', '2026-08-30T00:00:00Z') + ] + assert.deepEqual(summary(groupVersionsByRepoVersion(versions, ALL)), [['HEAD', ['3']], ['v4', ['2']], ['v3', ['1']]]) +}) + +test('repo versions with nothing under them are left out, and none is listed twice', () => { + const versions = [version('1', '2026-08-01T00:00:00Z', ['v2', 'v3', 'v4'], true)] + const groups = groupVersionsByRepoVersion(versions, ALL) + assert.deepEqual(summary(groups), [['v4', ['1']]]) + assert.equal(groups[0].created_at, '2026-10-23T00:00:00Z') +}) + +test('a list of another repo, such as the collection being viewed, is not used', () => { + const collectionVersions = [ + {id: 'v1', version: 'v1', type: 'Collection Version', version_url: '/orgs/MyOrg/collections/MyCollection/v1/', created_at: '2026-11-08T00:00:00Z'}, + {id: 'HEAD', version: 'HEAD', type: 'Collection Version', version_url: '/orgs/MyOrg/collections/MyCollection/', created_at: '2026-01-01T00:00:00Z'} + ] + const groups = groupVersionsByRepoVersion([version('1', '2026-11-01T00:00:00Z', [], true)], collectionVersions) + assert.deepEqual(summary(groups), [['HEAD', ['1']]]) + assert.equal(groups[0].version_url, SOURCE) + assert.equal(groups[0].type, 'Source Version') +}) + +test('a repo version missing from the list still gets its group, placed by its versions\' dates', () => { + const versions = [ + version('2', '2026-10-01T00:00:00Z', ['v4'], true), + version('1', '2025-01-01T00:00:00Z', ['v0']) + ] + const groups = groupVersionsByRepoVersion(versions, ALL) + assert.deepEqual(summary(groups), [['v4', ['2']], ['v0', ['1']]]) + assert.equal(groups[1].version_url, `${SOURCE}v0/`) +}) + +test('with no repo version list at all, everything still has a place', () => { + const versions = [version('2', '2026-11-01T00:00:00Z', [], true), version('1', '2026-07-01T00:00:00Z', ['v1'])] + assert.deepEqual(summary(groupVersionsByRepoVersion(versions, [])), [['HEAD', ['2']], ['v1', ['1']]]) + assert.deepEqual(groupVersionsByRepoVersion([], ALL), []) +}) + +test('HEAD is found by its id, and a repo version URL reads back as a repo version', () => { + assert.equal(isHead(HEAD), true) + assert.equal(isHead(ALL[0]), false) + assert.deepEqual(toRepoVersion('/orgs/CIEL/sources/CIEL/v2026-10-23/'), { + ownerType: 'orgs', owner: 'CIEL', type: 'Source Version', id: 'CIEL', version: 'v2026-10-23', + uri: '/orgs/CIEL/sources/CIEL/v2026-10-23/', version_url: '/orgs/CIEL/sources/CIEL/v2026-10-23/' + }) +}) diff --git a/src/components/concepts/historyGroups.js b/src/components/concepts/historyGroups.js new file mode 100644 index 000000000..a83ec982e --- /dev/null +++ b/src/components/concepts/historyGroups.js @@ -0,0 +1,86 @@ +// Groups a concept's or mapping's versions under the repo versions of its own source, for the History tab. +// The API leaves HEAD out of a version's source_versions, and a repo version list can be a single page, of +// another repo, or missing HEAD, so nothing here relies on the list being complete or on where HEAD sits in it. + +const HEAD = 'HEAD' + +// /orgs/CIEL/sources/CIEL/concepts/1/2/ and /orgs/CIEL/sources/CIEL/v1/ both belong to /orgs/CIEL/sources/CIEL/ +const repoOf = uri => uri.split('/').slice(0, 5).join('/') + '/' + +const createdOn = repoVersion => repoVersion?.created_on || repoVersion?.created_at + +const timeOf = date => (date ? Date.parse(date) : NaN) + +export const isHead = repoVersion => (repoVersion?.version || repoVersion?.id) === HEAD + +// A repo version known only by its URL, e.g. /orgs/CIEL/sources/CIEL/v1/ +export const toRepoVersion = uri => { + const [ownerType, owner, type, id, version] = uri.split('/').filter(Boolean) + return { + ownerType, + owner, + type: type === 'sources' ? 'Source Version' : (type === 'collections' ? 'Collection Version' : type), + id, + version, + uri, + version_url: uri + } +} + +// Repo versions newest first, HEAD at the top, each with the resource versions listed under it: +// - a version goes under the newest repo version that contains it; +// - the latest version, if no repo version contains it, goes under HEAD; +// - an earlier version no repo version contains goes under the first repo version created after it, else HEAD. +// Repo versions with nothing under them are left out. +export const groupVersionsByRepoVersion = (versions, repoVersions) => { + if(!versions?.length) + return [] + + const repoURI = repoOf(versions[0].version_url) + const known = (repoVersions || []).filter(repoVersion => repoVersion?.version_url && repoOf(repoVersion.version_url) === repoURI) + const head = known.find(isHead) || {...toRepoVersion(repoURI), version: HEAD} + const byURL = new Map(known.map(repoVersion => [repoVersion.version_url, repoVersion])) + byURL.set(head.version_url, head) + const datedOldestFirst = known + .filter(repoVersion => !isHead(repoVersion) && !isNaN(timeOf(createdOn(repoVersion)))) + .sort((a, b) => timeOf(createdOn(a)) - timeOf(createdOn(b))) + + // the API lists source_versions oldest first, so that order stands in for dates the list doesn't have + const newestOf = urls => { + const times = urls.map(url => timeOf(createdOn(byURL.get(url)))) + return times.some(isNaN) ? urls[urls.length - 1] : urls[times.indexOf(Math.max(...times))] + } + + const groups = new Map() + const add = (uri, version) => { + if(!groups.has(uri)) + groups.set(uri, {...(byURL.get(uri) || toRepoVersion(uri)), resourceVersions: []}) + groups.get(uri).resourceVersions.push(version) + } + + versions.forEach(version => { + const containing = version.source_versions || [] + if(containing.length) + add(newestOf(containing), version) + else if(version.is_latest_version) + add(head.version_url, version) + else { + const versionCreatedAt = timeOf(version.version_created_on) + const next = datedOldestFirst.find(repoVersion => timeOf(createdOn(repoVersion)) > versionCreatedAt) + add((next || head).version_url, version) + } + }) + + const newestFirst = resourceVersions => [...resourceVersions].sort( + (a, b) => timeOf(b.version_created_on) - timeOf(a.version_created_on) + ) + const sortTime = group => { + const time = timeOf(createdOn(group)) + return isNaN(time) ? Math.max(...group.resourceVersions.map(version => timeOf(version.version_created_on))) : time + } + const result = [...groups.values()].map(group => ({...group, resourceVersions: newestFirst(group.resourceVersions)})) + return [ + ...result.filter(isHead), + ...result.filter(group => !isHead(group)).sort((a, b) => sortTime(b) - sortTime(a)) + ] +} diff --git a/src/components/mappings/MappingHome.jsx b/src/components/mappings/MappingHome.jsx index 15d49278e..0c653c484 100644 --- a/src/components/mappings/MappingHome.jsx +++ b/src/components/mappings/MappingHome.jsx @@ -26,7 +26,7 @@ const MappingHome = props => { const [mapping, setMapping] = React.useState(props.mapping || {}) const [versions, setVersions] = React.useState([]) const [repo, setRepo] = React.useState(props.repo || {}) - const [repoVersions, setRepoVersions] = React.useState(props.repoVersions || []) + const [repoVersions, setRepoVersions] = React.useState({url: null, versions: []}) const [tab, setTab] = React.useState('metadata') const [edit, setEdit] = React.useState(false) const [createSimilar, setCreateSimilar] = React.useState(false) @@ -112,21 +112,22 @@ const MappingHome = props => { const service = APIService.new().overrideURL(_url) service.appendToUrl('versions/').get(null, null, {includeCollectionVersions: true, includeSourceVersions: true}).then(response => { setVersions(response.data || []) - if(!repoVersions?.length) - fetchRepoVersions(_url) - else - setLoading(false) + fetchRepoVersions(_url) }) } } - const fetchRepoVersions = url => { - if(repoVersions.length === 0 && url) { - APIService.new().overrideURL(dropVersion(toParentURI(url))).appendToUrl('versions/').get().then(response => { - setRepoVersions(response.data || []) - setLoading(false) - }) - } else setLoading(false) + // History needs every version of the mapping's own source, not a page of the repo being viewed + const fetchRepoVersions = mappingURL => { + const url = dropVersion(toParentURI(mappingURL)) + if(url === repoVersions.url) { + setLoading(false) + return + } + APIService.new().overrideURL(url).appendToUrl('versions/').get(null, null, {limit: 1000}).then(response => { + setRepoVersions({url, versions: response.data || []}) + setLoading(false) + }) } @@ -229,7 +230,7 @@ const MappingHome = props => { loading={loading} resource='mappings' icon={} - repoVersions={repoVersions} + repoVersions={repoVersions.versions} /> } {
{ Boolean(showConceptURL && !conceptForm) && - + } { Boolean(showMappingURL && !mappingForm) && - + } { showReferenceURL && From d065ba1111022406144f580dc20d5815cde1b096 Mon Sep 17 00:00:00 2001 From: Jonathan Payne Date: Tue, 10 Nov 2026 16:28:49 -0500 Subject: [PATCH 2/3] OpenConceptLab/ocl_issues#3021 | History retries a source's version list that failed to load Codex pass 1, F1.1: a failed request was kept as an empty list for that source, so History never asked again until the panel remounted. Co-Authored-By: Claude Opus 5.5 --- src/components/concepts/ConceptHome.jsx | 4 +++- src/components/mappings/MappingHome.jsx | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/components/concepts/ConceptHome.jsx b/src/components/concepts/ConceptHome.jsx index 3b332e12c..d5bf52309 100644 --- a/src/components/concepts/ConceptHome.jsx +++ b/src/components/concepts/ConceptHome.jsx @@ -155,7 +155,9 @@ const ConceptHome = props => { return } APIService.new().overrideURL(url).appendToUrl('versions/').get(null, null, {limit: 1000}).then(response => { - setRepoVersions({url, versions: response.data || []}) + // kept only when the request worked, so a failed one is tried again + if(Array.isArray(response?.data)) + setRepoVersions({url, versions: response.data}) setLoading(false) }) } diff --git a/src/components/mappings/MappingHome.jsx b/src/components/mappings/MappingHome.jsx index 0c653c484..03fc56bc8 100644 --- a/src/components/mappings/MappingHome.jsx +++ b/src/components/mappings/MappingHome.jsx @@ -125,7 +125,9 @@ const MappingHome = props => { return } APIService.new().overrideURL(url).appendToUrl('versions/').get(null, null, {limit: 1000}).then(response => { - setRepoVersions({url, versions: response.data || []}) + // kept only when the request worked, so a failed one is tried again + if(Array.isArray(response?.data)) + setRepoVersions({url, versions: response.data}) setLoading(false) }) } From be0c2d963b42976da38bbe42b68d3bdcf37fadd7 Mon Sep 17 00:00:00 2001 From: Jonathan Payne Date: Tue, 10 Nov 2026 16:32:58 -0500 Subject: [PATCH 3/3] OpenConceptLab/ocl_issues#3021 | History sorts its groups once and reuses createdOn Simplification review S2 and S4. Co-Authored-By: Claude Opus 5.5 --- src/components/concepts/History.jsx | 6 +++--- src/components/concepts/historyGroups.js | 10 ++++------ 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/components/concepts/History.jsx b/src/components/concepts/History.jsx index ee5627b24..0984b401a 100644 --- a/src/components/concepts/History.jsx +++ b/src/components/concepts/History.jsx @@ -29,7 +29,7 @@ import { copyURL, toFullAPIURL } from '../../common/utils'; import GAService from '../../services/GAService' import UserChip from '../users/UserChip' import RepoChip from '../repos/RepoChip' -import { groupVersionsByRepoVersion, toRepoVersion } from './historyGroups' +import { createdOn, groupVersionsByRepoVersion, toRepoVersion } from './historyGroups' const VersionMenu = ({version, repoVersion, onClose, anchorEl, resource, icon}) => { const url = repoVersion.version_url + resource + '/' + version.id + '/' @@ -233,8 +233,8 @@ const History = ({ versions, repoVersions, loading, icon, resource }) => { {t('repo.repo_version')} { - (repoVersion.created_on || repoVersion.created_at) && - <>{t('common.created_on').toLowerCase()} {moment(repoVersion.created_on || repoVersion.created_at).format('L')} + createdOn(repoVersion) && + <>{t('common.created_on').toLowerCase()} {moment(createdOn(repoVersion)).format('L')} }
diff --git a/src/components/concepts/historyGroups.js b/src/components/concepts/historyGroups.js index a83ec982e..dad83b102 100644 --- a/src/components/concepts/historyGroups.js +++ b/src/components/concepts/historyGroups.js @@ -7,7 +7,7 @@ const HEAD = 'HEAD' // /orgs/CIEL/sources/CIEL/concepts/1/2/ and /orgs/CIEL/sources/CIEL/v1/ both belong to /orgs/CIEL/sources/CIEL/ const repoOf = uri => uri.split('/').slice(0, 5).join('/') + '/' -const createdOn = repoVersion => repoVersion?.created_on || repoVersion?.created_at +export const createdOn = repoVersion => repoVersion?.created_on || repoVersion?.created_at const timeOf = date => (date ? Date.parse(date) : NaN) @@ -78,9 +78,7 @@ export const groupVersionsByRepoVersion = (versions, repoVersions) => { const time = timeOf(createdOn(group)) return isNaN(time) ? Math.max(...group.resourceVersions.map(version => timeOf(version.version_created_on))) : time } - const result = [...groups.values()].map(group => ({...group, resourceVersions: newestFirst(group.resourceVersions)})) - return [ - ...result.filter(isHead), - ...result.filter(group => !isHead(group)).sort((a, b) => sortTime(b) - sortTime(a)) - ] + return [...groups.values()] + .map(group => ({...group, resourceVersions: newestFirst(group.resourceVersions)})) + .sort((a, b) => (Number(isHead(b)) - Number(isHead(a))) || (sortTime(b) - sortTime(a))) }