From 6442269a333a16bc7a24d9b5b7910750c228999f Mon Sep 17 00:00:00 2001 From: Sunny Aggarwal Date: Sat, 7 Nov 2026 08:46:28 +0530 Subject: [PATCH 1/3] OpenConceptLab/ocl_online#655 | Show the versioning mode in version details --- src/components/repos/versionsTab.styles.js | 4 ++++ src/i18n/locales/en/translations.json | 5 ++++- src/i18n/locales/es/translations.json | 5 ++++- src/i18n/locales/pt-BR/translations.json | 5 ++++- src/i18n/locales/zh/translations.json | 5 ++++- 5 files changed, 20 insertions(+), 4 deletions(-) diff --git a/src/components/repos/versionsTab.styles.js b/src/components/repos/versionsTab.styles.js index 48d6ea292..1df35c868 100644 --- a/src/components/repos/versionsTab.styles.js +++ b/src/components/repos/versionsTab.styles.js @@ -52,6 +52,7 @@ const VERSION_ATTRIBUTE_LABEL_KEYS = { autoexpand: 'repo.autoexpand', expansion_url: 'repo.expansion_url', revision_date: 'repo.revision_date', + versioning_mode: 'repo.versioning_mode', extras: 'custom_attributes.label', 'checksums.standard': 'checksums.standard', 'checksums.smart': 'checksums.smart', @@ -95,6 +96,7 @@ const VERSION_ATTRIBUTE_ORDER = [ 'autoexpand', 'expansion_url', 'revision_date', + 'versioning_mode', 'extras', 'checksums.standard', 'checksums.smart', @@ -126,6 +128,8 @@ export const getVersionAttributeFields = (version, t) => { // the dialog renders a value only when it is truthy, so true/false needs a string if(isBoolean(value)) info.value = value.toString(); + if(field === 'versioning_mode' && value) + info.value = t(`repo.versioning_mode_${value}`, {defaultValue: startCase(value)}); fields[field] = info; }); return fields; diff --git a/src/i18n/locales/en/translations.json b/src/i18n/locales/en/translations.json index 651147233..e6522dd36 100644 --- a/src/i18n/locales/en/translations.json +++ b/src/i18n/locales/en/translations.json @@ -890,7 +890,10 @@ "could_not_clear_processing": "Could not clear the processing state", "export_not_ready_tooltip": "Export is still being generated for this version", "expansion_processing_tooltip": "This expansion is still being built", - "suggested_sources": "Suggested Sources" + "suggested_sources": "Suggested Sources", + "versioning_mode": "Versioning Mode", + "versioning_mode_carry_forward": "Carry Forward", + "versioning_mode_isolated": "Isolated" }, "org": { "my": "My Organizations", diff --git a/src/i18n/locales/es/translations.json b/src/i18n/locales/es/translations.json index 1cfc61a4c..10e534e91 100644 --- a/src/i18n/locales/es/translations.json +++ b/src/i18n/locales/es/translations.json @@ -526,7 +526,10 @@ "edit_title": "Editar versión de {{resourceType}}: {{version}}" } }, - "repo_version": "Versión del repositorio" + "repo_version": "Versión del repositorio", + "versioning_mode": "Modo de versionado", + "versioning_mode_carry_forward": "Continuar desde HEAD", + "versioning_mode_isolated": "Aislado" }, "org": { "my": "Mis organizaciones", diff --git a/src/i18n/locales/pt-BR/translations.json b/src/i18n/locales/pt-BR/translations.json index 4bc9965f8..df287cee0 100644 --- a/src/i18n/locales/pt-BR/translations.json +++ b/src/i18n/locales/pt-BR/translations.json @@ -879,7 +879,10 @@ "could_not_clear_processing": "Não foi possível limpar o estado de processamento", "export_not_ready_tooltip": "Exportação ainda está sendo gerada para esta versão", "expansion_processing_tooltip": "Esta expansão ainda está sendo construída", - "suggested_sources": "Sources sugeridos" + "suggested_sources": "Sources sugeridos", + "versioning_mode": "Modo de versionamento", + "versioning_mode_carry_forward": "Continuar a partir do HEAD", + "versioning_mode_isolated": "Isolado" }, "org": { "my": "Minhas organizações", diff --git a/src/i18n/locales/zh/translations.json b/src/i18n/locales/zh/translations.json index 682ba6442..314b12c7a 100644 --- a/src/i18n/locales/zh/translations.json +++ b/src/i18n/locales/zh/translations.json @@ -555,7 +555,10 @@ "edit_title": "编辑{{resourceType}}版本:{{version}}" } }, - "repo_version": "仓库版本" + "repo_version": "仓库版本", + "versioning_mode": "版本模式", + "versioning_mode_carry_forward": "沿用 HEAD", + "versioning_mode_isolated": "独立" }, "org": { "my": "我的组织机构", From e144c203f13de065bc7cd767d303c065c80ef1a6 Mon Sep 17 00:00:00 2001 From: Sunny Aggarwal Date: Fri, 13 Nov 2026 09:49:21 +0530 Subject: [PATCH 2/3] OpenConceptLab/ocl_online#673 | Show Seeded From in version details in place of the versioning mode --- .../repos/__tests__/seededFrom.test.js | 22 +++++++++++++++++++ src/components/repos/seededFrom.js | 10 +++++++++ src/components/repos/versionsTab.styles.js | 12 +++++----- src/i18n/locales/en/translations.json | 5 ++--- src/i18n/locales/es/translations.json | 5 ++--- src/i18n/locales/pt-BR/translations.json | 5 ++--- src/i18n/locales/zh/translations.json | 5 ++--- 7 files changed, 47 insertions(+), 17 deletions(-) create mode 100644 src/components/repos/__tests__/seededFrom.test.js create mode 100644 src/components/repos/seededFrom.js diff --git a/src/components/repos/__tests__/seededFrom.test.js b/src/components/repos/__tests__/seededFrom.test.js new file mode 100644 index 000000000..1e3a9a4ac --- /dev/null +++ b/src/components/repos/__tests__/seededFrom.test.js @@ -0,0 +1,22 @@ +import test from 'node:test' +import assert from 'node:assert/strict' + +const { getSeededFromLabel } = await import('../seededFrom.js') + +const t = key => ({'repo.seeded_from_import': 'Import'})[key] + +test('a version seeded from HEAD or another version shows that version', () => { + assert.equal(getSeededFromLabel({type: 'repo_version', url: '/orgs/Regenstrief/sources/LOINC/HEAD/'}, t), 'HEAD') + assert.equal(getSeededFromLabel({type: 'repo_version', url: '/orgs/Regenstrief/sources/LOINC/2.82/'}, t), '2.82') +}) + +test('a version seeded from an import shows Import', () => { + assert.equal(getSeededFromLabel({type: 'import', task: 'task-id'}, t), 'Import') + assert.equal(getSeededFromLabel({type: 'import', task: null}, t), 'Import') +}) + +test('no seed, or one this page does not know, shows nothing rather than raw JSON', () => { + assert.equal(getSeededFromLabel(null, t), undefined) + assert.equal(getSeededFromLabel({type: 'repo_version', url: null}, t), undefined) + assert.equal(getSeededFromLabel({type: 'other'}, t), undefined) +}) diff --git a/src/components/repos/seededFrom.js b/src/components/repos/seededFrom.js new file mode 100644 index 000000000..1ddd45b3f --- /dev/null +++ b/src/components/repos/seededFrom.js @@ -0,0 +1,10 @@ +// A version's seed for display: HEAD, the version id it was seeded from, or the import that seeded it. +export const getSeededFromLabel = (seededFrom, t) => { + if(!seededFrom?.type) + return undefined + if(seededFrom.type === 'import') + return t('repo.seeded_from_import') + if(seededFrom.type === 'repo_version' && seededFrom.url) + return seededFrom.url.replace(/\/+$/, '').split('/').pop() + return undefined +} diff --git a/src/components/repos/versionsTab.styles.js b/src/components/repos/versionsTab.styles.js index 1df35c868..d967d1392 100644 --- a/src/components/repos/versionsTab.styles.js +++ b/src/components/repos/versionsTab.styles.js @@ -4,6 +4,7 @@ import isNumber from 'lodash/isNumber'; import isObject from 'lodash/isObject'; import keys from 'lodash/keys'; import startCase from 'lodash/startCase'; +import { getSeededFromLabel } from './seededFrom'; export const REPO_VERSIONS_PAGE_SIZE = 25; @@ -52,7 +53,7 @@ const VERSION_ATTRIBUTE_LABEL_KEYS = { autoexpand: 'repo.autoexpand', expansion_url: 'repo.expansion_url', revision_date: 'repo.revision_date', - versioning_mode: 'repo.versioning_mode', + seeded_from: 'repo.seeded_from', extras: 'custom_attributes.label', 'checksums.standard': 'checksums.standard', 'checksums.smart': 'checksums.smart', @@ -96,7 +97,7 @@ const VERSION_ATTRIBUTE_ORDER = [ 'autoexpand', 'expansion_url', 'revision_date', - 'versioning_mode', + 'seeded_from', 'extras', 'checksums.standard', 'checksums.smart', @@ -122,14 +123,15 @@ export const getVersionAttributeFields = (version, t) => { const labelKey = VERSION_ATTRIBUTE_LABEL_KEYS[field]; const value = get(version, field); const info = { label: labelKey ? t(labelKey) : startCase(field) }; - const type = VERSION_ATTRIBUTE_TYPES[field] || (isObject(value) ? 'json' : undefined); + // the seed is shown as a label, never as raw JSON + const type = field === 'seeded_from' ? undefined : VERSION_ATTRIBUTE_TYPES[field] || (isObject(value) ? 'json' : undefined); if(type) info.type = type; // the dialog renders a value only when it is truthy, so true/false needs a string if(isBoolean(value)) info.value = value.toString(); - if(field === 'versioning_mode' && value) - info.value = t(`repo.versioning_mode_${value}`, {defaultValue: startCase(value)}); + if(field === 'seeded_from') + info.value = getSeededFromLabel(value, t); fields[field] = info; }); return fields; diff --git a/src/i18n/locales/en/translations.json b/src/i18n/locales/en/translations.json index e6522dd36..c604653f6 100644 --- a/src/i18n/locales/en/translations.json +++ b/src/i18n/locales/en/translations.json @@ -891,9 +891,8 @@ "export_not_ready_tooltip": "Export is still being generated for this version", "expansion_processing_tooltip": "This expansion is still being built", "suggested_sources": "Suggested Sources", - "versioning_mode": "Versioning Mode", - "versioning_mode_carry_forward": "Carry Forward", - "versioning_mode_isolated": "Isolated" + "seeded_from": "Seeded From", + "seeded_from_import": "Import" }, "org": { "my": "My Organizations", diff --git a/src/i18n/locales/es/translations.json b/src/i18n/locales/es/translations.json index 10e534e91..01356f47d 100644 --- a/src/i18n/locales/es/translations.json +++ b/src/i18n/locales/es/translations.json @@ -527,9 +527,8 @@ } }, "repo_version": "Versión del repositorio", - "versioning_mode": "Modo de versionado", - "versioning_mode_carry_forward": "Continuar desde HEAD", - "versioning_mode_isolated": "Aislado" + "seeded_from": "Creada a partir de", + "seeded_from_import": "Importación" }, "org": { "my": "Mis organizaciones", diff --git a/src/i18n/locales/pt-BR/translations.json b/src/i18n/locales/pt-BR/translations.json index df287cee0..0aa7947ee 100644 --- a/src/i18n/locales/pt-BR/translations.json +++ b/src/i18n/locales/pt-BR/translations.json @@ -880,9 +880,8 @@ "export_not_ready_tooltip": "Exportação ainda está sendo gerada para esta versão", "expansion_processing_tooltip": "Esta expansão ainda está sendo construída", "suggested_sources": "Sources sugeridos", - "versioning_mode": "Modo de versionamento", - "versioning_mode_carry_forward": "Continuar a partir do HEAD", - "versioning_mode_isolated": "Isolado" + "seeded_from": "Criada a partir de", + "seeded_from_import": "Importação" }, "org": { "my": "Minhas organizações", diff --git a/src/i18n/locales/zh/translations.json b/src/i18n/locales/zh/translations.json index 314b12c7a..b43bd2751 100644 --- a/src/i18n/locales/zh/translations.json +++ b/src/i18n/locales/zh/translations.json @@ -556,9 +556,8 @@ } }, "repo_version": "仓库版本", - "versioning_mode": "版本模式", - "versioning_mode_carry_forward": "沿用 HEAD", - "versioning_mode_isolated": "独立" + "seeded_from": "创建来源", + "seeded_from_import": "导入" }, "org": { "my": "我的组织机构", From 01a2fc4ecb4d9ad37158f0909cea49ff9baec09e Mon Sep 17 00:00:00 2001 From: Sunny Aggarwal Date: Fri, 13 Nov 2026 10:06:20 +0530 Subject: [PATCH 3/3] OpenConceptLab/ocl_online#673 | Use placeholder repo names in the seeded-from test so spellcheck passes --- src/components/repos/__tests__/seededFrom.test.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/repos/__tests__/seededFrom.test.js b/src/components/repos/__tests__/seededFrom.test.js index 1e3a9a4ac..0d4d15d53 100644 --- a/src/components/repos/__tests__/seededFrom.test.js +++ b/src/components/repos/__tests__/seededFrom.test.js @@ -6,8 +6,8 @@ const { getSeededFromLabel } = await import('../seededFrom.js') const t = key => ({'repo.seeded_from_import': 'Import'})[key] test('a version seeded from HEAD or another version shows that version', () => { - assert.equal(getSeededFromLabel({type: 'repo_version', url: '/orgs/Regenstrief/sources/LOINC/HEAD/'}, t), 'HEAD') - assert.equal(getSeededFromLabel({type: 'repo_version', url: '/orgs/Regenstrief/sources/LOINC/2.82/'}, t), '2.82') + assert.equal(getSeededFromLabel({type: 'repo_version', url: '/orgs/MyOrg/sources/MySource/HEAD/'}, t), 'HEAD') + assert.equal(getSeededFromLabel({type: 'repo_version', url: '/orgs/MyOrg/sources/MySource/2.82/'}, t), '2.82') }) test('a version seeded from an import shows Import', () => {