From ff84b8e5fcfdfb2621f88d94e6b3bce754471e12 Mon Sep 17 00:00:00 2001 From: Jonathan Payne Date: Mon, 16 Nov 2026 14:43:31 -0500 Subject: [PATCH 1/5] closes OpenConceptLab/ocl_issues#3039 | Restore the "View in TBv2" chip The chip came out with the unified navigation (OpenConceptLab/ocl_online#418). It now links to TBv2 at app.v2., which keeps working once TBv3 serves app., or to a configured TBV2_URL; other deployments show no chip. The path mapping moved to appUrls.js with tests, and also carries versioned expansions across. Phones hide the chip and medium widths show only its logo, so the header doesn't wrap beside + and the account button. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01AaZ4qX4xy8MVN45s1UuhFt --- Dockerfile | 1 + docker-compose.yml | 1 + package.json | 4 +- src/common/__tests__/appUrls.test.js | 63 ++++++++++++++- src/common/appUrls.js | 78 ++++++++++++++++++- src/common/utils.js | 16 +++- .../app/ClassicTermBrowserButton.jsx | 54 +++++++++++++ src/components/app/HeaderControls.jsx | 2 + src/components/common/ClassicOCLLogo.jsx | 16 ++++ src/i18n/locales/en/translations.json | 2 + src/i18n/locales/es/translations.json | 2 + src/i18n/locales/pt-BR/translations.json | 2 + src/i18n/locales/zh/translations.json | 2 + start-prod.sh | 3 + webpack.config.js | 1 + 15 files changed, 241 insertions(+), 6 deletions(-) create mode 100644 src/components/app/ClassicTermBrowserButton.jsx create mode 100644 src/components/common/ClassicOCLLogo.jsx diff --git a/Dockerfile b/Dockerfile index 777571351..b0340c5a2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,6 +20,7 @@ ENV ANALYTICS_API=${ANALYTICS_API} ENV AI_ASSISTANT_API_URL=${AI_ASSISTANT_API_URL} ENV OCL_ONLINE_API_URL=${OCL_ONLINE_API_URL} ENV MAPPER_URL=${MAPPER_URL} +ENV TBV2_URL=${TBV2_URL} RUN mkdir /app WORKDIR /app ENV PATH /app/node_modules/.bin:$PATH diff --git a/docker-compose.yml b/docker-compose.yml index ab4ff74cc..7334bc23d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -19,6 +19,7 @@ services: - AI_ASSISTANT_API_URL=${AI_ASSISTANT_API_URL-} - OCL_ONLINE_API_URL=${OCL_ONLINE_API_URL-} - MAPPER_URL=${MAPPER_URL-} + - TBV2_URL=${TBV2_URL-} - ERRBIT_URL - ERRBIT_KEY - HOTJAR_ID diff --git a/package.json b/package.json index 2a2e950fa..6eabec3a4 100644 --- a/package.json +++ b/package.json @@ -51,8 +51,8 @@ "react-is": "^18.3.1" }, "scripts": { - "start": "./node_modules/webpack-dev-server/bin/webpack-dev-server.js --progress --host 0.0.0.0 --port ${WEB_PORT} --env API_URL=${API_URL} --env NODE_ENV=${NODE_ENV} --env RECAPTCHA_SITE_KEY=${RECAPTCHA_SITE_KEY} --env GA_ACCOUNT_ID=${GA_ACCOUNT_ID} --env HOTJAR_ID=${HOTJAR_ID} --env ERRBIT_URL=${ERRBIT_URL} --env ERRBIT_KEY=${ERRBIT_KEY} --env LOGIN_REDIRECT_URL=${LOGIN_REDIRECT_URL} --env OIDC_RP_CLIENT_ID=${OIDC_RP_CLIENT_ID} --env OIDC_SERVER_URL=${OIDC_SERVER_URL} --env OIDC_REALM=${OIDC_REALM} --env ANALYTICS_API=${ANALYTICS_API} --env AI_ASSISTANT_API_URL=${AI_ASSISTANT_API_URL} --env OCL_ONLINE_API_URL=${OCL_ONLINE_API_URL} --env MAPPER_URL=${MAPPER_URL} --mode ${NODE_ENV} --hot", - "build": "node --max-old-space-size=1536 ./node_modules/webpack/bin/webpack.js --progress --env API_URL=${API_URL} --env NODE_ENV=${NODE_ENV} --env RECAPTCHA_SITE_KEY=${RECAPTCHA_SITE_KEY} --env GA_ACCOUNT_ID=${GA_ACCOUNT_ID} --env HOTJAR_ID=${HOTJAR_ID} --env ERRBIT_URL=${ERRBIT_URL} --env ERRBIT_KEY=${ERRBIT_KEY} --env LOGIN_REDIRECT_URL=${LOGIN_REDIRECT_URL} --env OIDC_RP_CLIENT_ID=${OIDC_RP_CLIENT_ID} --env OIDC_SERVER_URL=${OIDC_SERVER_URL} --env OIDC_REALM=${OIDC_REALM} --env ANALYTICS_API=${ANALYTICS_API} --env AI_ASSISTANT_API_URL=${AI_ASSISTANT_API_URL} --env OCL_ONLINE_API_URL=${OCL_ONLINE_API_URL} --env MAPPER_URL=${MAPPER_URL} --mode ${NODE_ENV}", + "start": "./node_modules/webpack-dev-server/bin/webpack-dev-server.js --progress --host 0.0.0.0 --port ${WEB_PORT} --env API_URL=${API_URL} --env NODE_ENV=${NODE_ENV} --env RECAPTCHA_SITE_KEY=${RECAPTCHA_SITE_KEY} --env GA_ACCOUNT_ID=${GA_ACCOUNT_ID} --env HOTJAR_ID=${HOTJAR_ID} --env ERRBIT_URL=${ERRBIT_URL} --env ERRBIT_KEY=${ERRBIT_KEY} --env LOGIN_REDIRECT_URL=${LOGIN_REDIRECT_URL} --env OIDC_RP_CLIENT_ID=${OIDC_RP_CLIENT_ID} --env OIDC_SERVER_URL=${OIDC_SERVER_URL} --env OIDC_REALM=${OIDC_REALM} --env ANALYTICS_API=${ANALYTICS_API} --env AI_ASSISTANT_API_URL=${AI_ASSISTANT_API_URL} --env OCL_ONLINE_API_URL=${OCL_ONLINE_API_URL} --env MAPPER_URL=${MAPPER_URL} --env TBV2_URL=${TBV2_URL} --mode ${NODE_ENV} --hot", + "build": "node --max-old-space-size=1536 ./node_modules/webpack/bin/webpack.js --progress --env API_URL=${API_URL} --env NODE_ENV=${NODE_ENV} --env RECAPTCHA_SITE_KEY=${RECAPTCHA_SITE_KEY} --env GA_ACCOUNT_ID=${GA_ACCOUNT_ID} --env HOTJAR_ID=${HOTJAR_ID} --env ERRBIT_URL=${ERRBIT_URL} --env ERRBIT_KEY=${ERRBIT_KEY} --env LOGIN_REDIRECT_URL=${LOGIN_REDIRECT_URL} --env OIDC_RP_CLIENT_ID=${OIDC_RP_CLIENT_ID} --env OIDC_SERVER_URL=${OIDC_SERVER_URL} --env OIDC_REALM=${OIDC_REALM} --env ANALYTICS_API=${ANALYTICS_API} --env AI_ASSISTANT_API_URL=${AI_ASSISTANT_API_URL} --env OCL_ONLINE_API_URL=${OCL_ONLINE_API_URL} --env MAPPER_URL=${MAPPER_URL} --env TBV2_URL=${TBV2_URL} --mode ${NODE_ENV}", "eslint": "./node_modules/.bin/eslint ./src --ext .jsx,.js", "test": "node --disable-warning=MODULE_TYPELESS_PACKAGE_JSON --test 'src/**/__tests__/**/*.test.js'" }, diff --git a/src/common/__tests__/appUrls.test.js b/src/common/__tests__/appUrls.test.js index c4256c025..77af10c27 100644 --- a/src/common/__tests__/appUrls.test.js +++ b/src/common/__tests__/appUrls.test.js @@ -1,7 +1,7 @@ import test from 'node:test' import assert from 'node:assert/strict' -const { resolveMapperURL, toAPIOrigin } = await import('../appUrls.js') +const { resolveMapperURL, resolveTBv2URL, toAPIOrigin, toTBv2Path } = await import('../appUrls.js') test('configured URL wins and loses its trailing slash', () => { assert.equal(resolveMapperURL('http://localhost:4004/', 'https://app.v3.qa.openconceptlab.org'), 'http://localhost:4004') @@ -30,3 +30,64 @@ test('every Term Browser host maps to its environment\'s API', () => { assert.equal(toAPIOrigin('https://app.v3.qa.openconceptlab.org'), 'https://api.qa.openconceptlab.org') assert.equal(toAPIOrigin('https://api.openconceptlab.org'), 'https://api.openconceptlab.org') }) + +test('TBv2: configured URL wins, official hosts map to app.v2 of the same environment', () => { + assert.equal(resolveTBv2URL('https://tb2.example.org/', 'https://tb3.example.org'), 'https://tb2.example.org') + assert.equal(resolveTBv2URL('', 'https://app.v3.openconceptlab.org'), 'https://app.v2.openconceptlab.org') + assert.equal(resolveTBv2URL('', 'https://app.openconceptlab.org'), 'https://app.v2.openconceptlab.org') + assert.equal(resolveTBv2URL(undefined, 'https://app.v3.qa.openconceptlab.org'), 'https://app.v2.qa.openconceptlab.org') +}) + +test('TBv2: localhost and custom hosts have no TBv2 without configuration', () => { + assert.equal(resolveTBv2URL('', 'http://localhost:4002'), '') + assert.equal(resolveTBv2URL('', 'https://terms.example.org'), '') + assert.equal(resolveTBv2URL('', undefined), '') +}) + +test('TBv2 path: shared pages keep their path', () => { + const same = [ + '/', '/search', '/imports', '/concepts/compare', + '/orgs/CIEL', '/orgs/CIEL/edit', '/users/admin/settings', + '/orgs/CIEL/sources/CIEL', + '/orgs/CIEL/sources/CIEL/v2026-10-01', + '/orgs/CIEL/sources/CIEL/concepts', + '/orgs/CIEL/sources/CIEL/concepts/1066', + '/orgs/CIEL/sources/CIEL/v2026-10-01/mappings/123', + '/orgs/CIEL/sources/CIEL/about', + '/users/admin/collections/vs/references', + '/users/admin/collections/vs/v1/expansions/autoexpand-v1/concepts/1066', + ] + same.forEach(path => assert.equal(toTBv2Path(path), path, path)) +}) + +test('TBv2 path: query strings and trailing slashes are dropped', () => { + assert.equal(toTBv2Path('/search?q=malaria&type=concepts'), '/search') + assert.equal(toTBv2Path('/orgs/CIEL/sources/CIEL/concepts/1066/'), '/orgs/CIEL/sources/CIEL/concepts/1066') + assert.equal(toTBv2Path(''), '/') + assert.equal(toTBv2Path(undefined), '/') +}) + +test('TBv2 path: pages TBv2 lacks fall back to the nearest page it has', () => { + assert.equal(toTBv2Path('/url-registry'), '/') + assert.equal(toTBv2Path('/admin/users/admin'), '/') + assert.equal(toTBv2Path('/orgs/CIEL/url-registry'), '/orgs/CIEL') + assert.equal(toTBv2Path('/users/admin/map-projects'), '/users/admin') + assert.equal(toTBv2Path('/users/admin/usage'), '/users/admin') + assert.equal(toTBv2Path('/orgs/CIEL/sources/CIEL/summary'), '/orgs/CIEL/sources/CIEL') + assert.equal(toTBv2Path('/orgs/CIEL/sources/CIEL/v1/summary'), '/orgs/CIEL/sources/CIEL/v1') + assert.equal(toTBv2Path('/orgs/CIEL/sources/CIEL/edit'), '/orgs/CIEL/sources/CIEL') + assert.equal(toTBv2Path('/orgs/CIEL/sources/CIEL/compare-versions'), '/orgs/CIEL/sources/CIEL') + assert.equal(toTBv2Path('/orgs/CIEL/sources/CIEL/v%201/concepts'), '/orgs/CIEL/sources/CIEL') +}) + +test('TBv2 path: expansions carry over only under a version, and only for concepts and mappings', () => { + assert.equal(toTBv2Path('/orgs/o/collections/c/expansions/e1/concepts/1066'), '/orgs/o/collections/c/concepts/1066') + assert.equal(toTBv2Path('/orgs/o/collections/c/v1/expansions/e1/mappings'), '/orgs/o/collections/c/v1/expansions/e1/mappings') + assert.equal(toTBv2Path('/orgs/o/collections/c/v1/expansions/e1/references'), '/orgs/o/collections/c/v1/references') + assert.equal(toTBv2Path('/orgs/o/collections/c/v1/expansions/e1/summary'), '/orgs/o/collections/c/v1') +}) + +test('TBv2 path: a resource is carried only on concepts and mappings, and only if it is a plain id', () => { + assert.equal(toTBv2Path('/orgs/o/collections/c/references/r1'), '/orgs/o/collections/c/references') + assert.equal(toTBv2Path('/orgs/CIEL/sources/CIEL/concepts/a%2Fb'), '/orgs/CIEL/sources/CIEL/concepts') +}) diff --git a/src/common/appUrls.js b/src/common/appUrls.js index 04785f7ec..9360489ef 100644 --- a/src/common/appUrls.js +++ b/src/common/appUrls.js @@ -4,11 +4,85 @@ const OFFICIAL_ORIGIN = /^https:\/\/app\.(v3\.)?([a-z]+\.)*openconceptlab\.org$/ // Every one of those hosts shares its environment's API at api.. export const toAPIOrigin = origin => origin.replace(/:\/\/app\.(v[23]\.)?/, '://api.') -export const resolveMapperURL = (configured, origin) => { +// A configured URL wins. Otherwise an official host links to the same environment's sibling app, and any +// other deployment has none. +const resolveSiblingURL = (configured, origin, host) => { const url = (configured || '').trim().replace(/\/+$/, '') if(url) return url if(OFFICIAL_ORIGIN.test(origin || '')) - return origin.replace(/\/\/app\.(v3\.)?/, '//map.') + return origin.replace(/\/\/app\.(v3\.)?/, `//${host}.`) return '' } + +export const resolveMapperURL = (configured, origin) => resolveSiblingURL(configured, origin, 'map') + +// app.v2. rather than app., which serves TBv3 once it becomes the default Term Browser. +export const resolveTBv2URL = (configured, origin) => resolveSiblingURL(configured, origin, 'app.v2') + +/* + * TBv2 serves most TBv3 pages at the same path, so moving across is a host swap. Where TBv2 lacks the page, + * toTBv2Path walks up to the nearest page it has: repository (or version), then owner, then home. + */ + +// ID_REGEX in constants.js, which this file can't import: its tests run under plain node. +const ROUTE_ID = /^[a-zA-Z0-9._@-]+$/ +const isRouteId = segment => Boolean(segment) && ROUTE_ID.test(segment) + +const SHARED_ROOT_PATHS = ['/search', '/imports', '/concepts/compare', '/mappings/compare'] +const SHARED_OWNER_PATHS = {users: ['settings'], orgs: ['edit']} +const SHARED_REPO_TABS = ['concepts', 'mappings', 'references', 'versions', 'about'] +// The only tabs TBv2 opens a resource in, and the only ones it scopes to a (versioned) expansion. +const RESOURCE_TABS = ['concepts', 'mappings'] +// What TBv3 may put right after a repository. Anything else there is a version. +const REPO_KEYWORDS = [...SHARED_REPO_TABS, 'summary', 'edit', 'compare-versions', 'expansions'] + +export const toTBv2Path = path => { + const segments = (path || '').split(/[?#]/)[0].split('/').filter(Boolean) + const fullPath = '/' + segments.join('/') + + if(SHARED_ROOT_PATHS.includes(fullPath)) + return fullPath + + const [ownerType, owner, repoType, repo, ...rest] = segments + + if(!['users', 'orgs'].includes(ownerType) || !isRouteId(owner)) + return '/' + + const ownerHome = `/${ownerType}/${owner}` + + if(segments.length === 3 && SHARED_OWNER_PATHS[ownerType].includes(repoType)) + return fullPath + + if(!['sources', 'collections'].includes(repoType) || !isRouteId(repo)) + return ownerHome + + let base = `${ownerHome}/${repoType}/${repo}` + let index = 0 + + const version = rest[index] && !REPO_KEYWORDS.includes(rest[index]) ? rest[index] : '' + if(version) { + if(!isRouteId(version)) + return base + base = `${base}/${version}` + index += 1 + } + + let expansion = '' + if(rest[index] === 'expansions') { + expansion = rest[index + 1] + index += 2 + } + + const tab = rest[index] + if(!SHARED_REPO_TABS.includes(tab)) + return base + + if(!RESOURCE_TABS.includes(tab)) + return `${base}/${tab}` + + const tabPath = version && isRouteId(expansion) ? `${base}/expansions/${expansion}/${tab}` : `${base}/${tab}` + const resource = rest[index + 1] + + return isRouteId(resource) ? `${tabPath}/${resource}` : tabPath +} diff --git a/src/common/utils.js b/src/common/utils.js index d73a5ef45..27cd7abeb 100644 --- a/src/common/utils.js +++ b/src/common/utils.js @@ -19,7 +19,7 @@ import { ensureIdToken, prepareSignOut, settleForcedSignOut, renewSessionSilentl import { getEnv } from './env'; import { SERVER_CONFIGS } from './serverConfigs'; import { legacyHashRoute, isSameSitePath } from './history'; -import { resolveMapperURL } from './appUrls'; +import { resolveMapperURL, resolveTBv2URL, toTBv2Path } from './appUrls'; export { dropVersion } from './uri'; @@ -1102,6 +1102,20 @@ export const toMapperURL = path => { return `${url}/#${path || '/'}?${referrerParams}` } +// The same page in TBv2, or '' when this deployment has no TBv2 +export const toTBv2URL = path => { + const url = resolveTBv2URL(window.TBV2_URL || process.env.TBV2_URL, window.location.origin) + if(!url) + return '' + + // TBv2 reads auth only from the segment after the first '?' in the referrer, so drop this page's own query + let referrerParams = `referrer=${window.location.href.split(/[?#]/)[0]}` + if(isLoggedIn()) + referrerParams += '?auth=true' + + return `${url}/#${toTBv2Path(path)}?${referrerParams}` +} + export const isMapperURL = url => { if(!url) return false diff --git a/src/components/app/ClassicTermBrowserButton.jsx b/src/components/app/ClassicTermBrowserButton.jsx new file mode 100644 index 000000000..4ef9c0202 --- /dev/null +++ b/src/components/app/ClassicTermBrowserButton.jsx @@ -0,0 +1,54 @@ +import React from 'react'; +import { useTranslation } from 'react-i18next'; +import { useLocation } from 'react-router-dom'; +import Chip from '@mui/material/Chip'; +import Tooltip from '@mui/material/Tooltip'; +import { toTBv2URL } from '../../common/utils'; +import ClassicOCLLogo from '../common/ClassicOCLLogo'; + +// TBv2's own primary color, so the chip reads as a way into TBv2 (TBv2's "View in TBv3" chip uses TBv3's) +const V2_PRIMARY = 'rgb(51, 115, 170)'; + +const ClassicTermBrowserButton = () => { + const { t } = useTranslation(); + const location = useLocation(); + const href = toTBv2URL(location.pathname); + + if(!href) + return null; + + return ( + + } + label={t('common.classic_termbrowser')} + // The header's right column can't fit the chip beside + and the account button on a phone, nor its + // label below md, where the tooltip carries it instead. + sx={{ + display: {xs: 'none', sm: 'inline-flex'}, + marginRight: '8px', + paddingLeft: {sm: '6px', md: '8px'}, + verticalAlign: 'middle', + color: V2_PRIMARY, + borderColor: V2_PRIMARY, + '.MuiChip-icon': { + marginRight: {sm: '6px', md: '-6px'} + }, + '.MuiChip-label': { + display: {sm: 'none', md: 'block'}, + paddingLeft: '6px', + paddingRight: '8px' + } + }} + /> + + ); +}; + +export default ClassicTermBrowserButton; diff --git a/src/components/app/HeaderControls.jsx b/src/components/app/HeaderControls.jsx index a1e00ab61..fe6f2e7c0 100644 --- a/src/components/app/HeaderControls.jsx +++ b/src/components/app/HeaderControls.jsx @@ -6,6 +6,7 @@ import ErrorBoundary from '../errors/ErrorBoundary'; import UserProfileButton from '../users/UserProfileButton'; import AddMenuList from '../users/AddMenuList' import { isLoggedIn } from '../../common/utils'; +import ClassicTermBrowserButton from './ClassicTermBrowserButton'; const HeaderControls = () => { @@ -26,6 +27,7 @@ const HeaderControls = () => { return (
+ { authenticated && diff --git a/src/components/common/ClassicOCLLogo.jsx b/src/components/common/ClassicOCLLogo.jsx new file mode 100644 index 000000000..572ea1ee5 --- /dev/null +++ b/src/components/common/ClassicOCLLogo.jsx @@ -0,0 +1,16 @@ +/*eslint spellcheck/spell-checker: 0*/ +import React from 'react'; + +const CLASSIC_LOGO = 'data:image/png;base64,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'; + +const ClassicOCLLogo = ({ size }) => ( + +); + +export default ClassicOCLLogo; diff --git a/src/i18n/locales/en/translations.json b/src/i18n/locales/en/translations.json index 38e54031a..94c185a84 100644 --- a/src/i18n/locales/en/translations.json +++ b/src/i18n/locales/en/translations.json @@ -202,6 +202,8 @@ "suggested": "Suggested", "rest": "Rest", "click_here": "click here", + "classic_termbrowser": "View in TBv2", + "back_to_classic_termbrowser": "Back to the classic TermBrowser", "already_exists": "Already exists", "comment": "Comment", "update_comment": "Update comment", diff --git a/src/i18n/locales/es/translations.json b/src/i18n/locales/es/translations.json index 962020382..74f3ab16e 100644 --- a/src/i18n/locales/es/translations.json +++ b/src/i18n/locales/es/translations.json @@ -85,6 +85,8 @@ "location": "Ubicación", "generic_error": "Algo salió mal.", "click_here": "haz clic aquí", + "classic_termbrowser": "Ver en TBv2", + "back_to_classic_termbrowser": "Volver al TermBrowser clásico", "all": "Todos", "add": "Agregar", "already_exists": "Ya existe", diff --git a/src/i18n/locales/pt-BR/translations.json b/src/i18n/locales/pt-BR/translations.json index 8cdffbcf0..b6d1c7c79 100644 --- a/src/i18n/locales/pt-BR/translations.json +++ b/src/i18n/locales/pt-BR/translations.json @@ -202,6 +202,8 @@ "suggested": "Sugeridos", "rest": "Restante", "click_here": "clique aqui", + "classic_termbrowser": "Ver no TBv2", + "back_to_classic_termbrowser": "Voltar para o TermBrowser clássico", "already_exists": "Já existe", "comment": "Comentário", "update_comment": "Comentário de atualização", diff --git a/src/i18n/locales/zh/translations.json b/src/i18n/locales/zh/translations.json index a2432dbd4..bbe9d8a90 100644 --- a/src/i18n/locales/zh/translations.json +++ b/src/i18n/locales/zh/translations.json @@ -124,6 +124,8 @@ "something_went_wrong": "出了些问题", "no_results": "无结果", "click_here": "点击此处", + "classic_termbrowser": "在 TBv2 中查看", + "back_to_classic_termbrowser": "返回经典版 TermBrowser", "already_exists": "已存在", "comment": "备注", "update_comment": "更新说明", diff --git a/start-prod.sh b/start-prod.sh index 46c5faf21..583119287 100755 --- a/start-prod.sh +++ b/start-prod.sh @@ -47,6 +47,9 @@ fi if [[ ! -z "${MAPPER_URL}" ]]; then echo "var MAPPER_URL = \"${MAPPER_URL}\";" >> ${ENV_FILE} fi +if [[ ! -z "${TBV2_URL}" ]]; then + echo "var TBV2_URL = \"${TBV2_URL}\";" >> ${ENV_FILE} +fi if [[ ! -z "${OCL_ONLINE_API_URL}" ]]; then echo "var OCL_ONLINE_API_URL = \"${OCL_ONLINE_API_URL}\";" >> ${ENV_FILE} fi diff --git a/webpack.config.js b/webpack.config.js index c1d1aedd2..e0fe1d250 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -148,6 +148,7 @@ module.exports = (env) => { 'process.env.ANALYTICS_API': JSON.stringify(env.ANALYTICS_API || ''), 'process.env.AI_ASSISTANT_API_URL': JSON.stringify(env.AI_ASSISTANT_API_URL || ''), 'process.env.MAPPER_URL': JSON.stringify(env.MAPPER_URL || ''), + 'process.env.TBV2_URL': JSON.stringify(env.TBV2_URL || ''), 'process.env.OCL_ONLINE_API_URL': JSON.stringify(env.OCL_ONLINE_API_URL || ''), }), new IgnorePlugin({ resourceRegExp: /moment\/locale\// }) From ead9b7c21eab3a1b637cadad60acbf454831d583 Mon Sep 17 00:00:00 2001 From: Jonathan Payne Date: Mon, 16 Nov 2026 14:46:34 -0500 Subject: [PATCH 2/5] OpenConceptLab/ocl_issues#3039 | Keep an unversioned expansion by naming HEAD in TBv2 Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01AaZ4qX4xy8MVN45s1UuhFt --- src/common/__tests__/appUrls.test.js | 5 +++-- src/common/appUrls.js | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/common/__tests__/appUrls.test.js b/src/common/__tests__/appUrls.test.js index 77af10c27..823a969c3 100644 --- a/src/common/__tests__/appUrls.test.js +++ b/src/common/__tests__/appUrls.test.js @@ -80,10 +80,11 @@ test('TBv2 path: pages TBv2 lacks fall back to the nearest page it has', () => { assert.equal(toTBv2Path('/orgs/CIEL/sources/CIEL/v%201/concepts'), '/orgs/CIEL/sources/CIEL') }) -test('TBv2 path: expansions carry over only under a version, and only for concepts and mappings', () => { - assert.equal(toTBv2Path('/orgs/o/collections/c/expansions/e1/concepts/1066'), '/orgs/o/collections/c/concepts/1066') +test('TBv2 path: expansions carry over for concepts and mappings, under HEAD when no version is named', () => { + assert.equal(toTBv2Path('/orgs/o/collections/c/expansions/e1/concepts/1066'), '/orgs/o/collections/c/HEAD/expansions/e1/concepts/1066') assert.equal(toTBv2Path('/orgs/o/collections/c/v1/expansions/e1/mappings'), '/orgs/o/collections/c/v1/expansions/e1/mappings') assert.equal(toTBv2Path('/orgs/o/collections/c/v1/expansions/e1/references'), '/orgs/o/collections/c/v1/references') + assert.equal(toTBv2Path('/orgs/o/collections/c/expansions/e1/references'), '/orgs/o/collections/c/references') assert.equal(toTBv2Path('/orgs/o/collections/c/v1/expansions/e1/summary'), '/orgs/o/collections/c/v1') }) diff --git a/src/common/appUrls.js b/src/common/appUrls.js index 9360489ef..eda666a64 100644 --- a/src/common/appUrls.js +++ b/src/common/appUrls.js @@ -32,7 +32,7 @@ const isRouteId = segment => Boolean(segment) && ROUTE_ID.test(segment) const SHARED_ROOT_PATHS = ['/search', '/imports', '/concepts/compare', '/mappings/compare'] const SHARED_OWNER_PATHS = {users: ['settings'], orgs: ['edit']} const SHARED_REPO_TABS = ['concepts', 'mappings', 'references', 'versions', 'about'] -// The only tabs TBv2 opens a resource in, and the only ones it scopes to a (versioned) expansion. +// The only tabs TBv2 opens a resource in, and the only ones it scopes to an expansion. const RESOURCE_TABS = ['concepts', 'mappings'] // What TBv3 may put right after a repository. Anything else there is a version. const REPO_KEYWORDS = [...SHARED_REPO_TABS, 'summary', 'edit', 'compare-versions', 'expansions'] @@ -81,7 +81,8 @@ export const toTBv2Path = path => { if(!RESOURCE_TABS.includes(tab)) return `${base}/${tab}` - const tabPath = version && isRouteId(expansion) ? `${base}/expansions/${expansion}/${tab}` : `${base}/${tab}` + // TBv2 scopes an expansion to a version, so one without names HEAD + const tabPath = isRouteId(expansion) ? `${base}${version ? '' : '/HEAD'}/expansions/${expansion}/${tab}` : `${base}/${tab}` const resource = rest[index + 1] return isRouteId(resource) ? `${tabPath}/${resource}` : tabPath From aace1994d90845577c00f59d95b862317379294e Mon Sep 17 00:00:00 2001 From: Jonathan Payne Date: Mon, 16 Nov 2026 14:49:25 -0500 Subject: [PATCH 3/5] OpenConceptLab/ocl_issues#3039 | Drop the logo's unused size prop and props MUI already supplies Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01AaZ4qX4xy8MVN45s1UuhFt --- src/components/app/ClassicTermBrowserButton.jsx | 2 -- src/components/common/ClassicOCLLogo.jsx | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/components/app/ClassicTermBrowserButton.jsx b/src/components/app/ClassicTermBrowserButton.jsx index 4ef9c0202..34687aa03 100644 --- a/src/components/app/ClassicTermBrowserButton.jsx +++ b/src/components/app/ClassicTermBrowserButton.jsx @@ -20,12 +20,10 @@ const ClassicTermBrowserButton = () => { return ( } label={t('common.classic_termbrowser')} // The header's right column can't fit the chip beside + and the account button on a phone, nor its diff --git a/src/components/common/ClassicOCLLogo.jsx b/src/components/common/ClassicOCLLogo.jsx index 572ea1ee5..b20c18cd3 100644 --- a/src/components/common/ClassicOCLLogo.jsx +++ b/src/components/common/ClassicOCLLogo.jsx @@ -3,12 +3,12 @@ import React from 'react'; const CLASSIC_LOGO = 'data:image/png;base64,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'; -const ClassicOCLLogo = ({ size }) => ( +const ClassicOCLLogo = () => ( ); From eb0bc3da8b7f96561700b437e6ef746a6a834e64 Mon Sep 17 00:00:00 2001 From: Sunny Aggarwal Date: Tue, 17 Nov 2026 09:26:32 +0530 Subject: [PATCH 4/5] OpenConceptLab/ocl_issues#3039 | Address review: summary, /orgs/new, referrer, config-aware URL checks, phone entry - toTBv2Path reuses parseRepoPath, keeps source summary (TBv2 has it) and sends /orgs/new home - Mapper and TBv2 links share one referrer builder that drops the page's query, so auth=true survives - isV2URL and isMapperURL also accept the configured TBV2_URL / MAPPER_URL - Phones get "View in TBv2" in the account menu, where the header has no room for the chip - The chip's accessible name matches its visible label; the tooltip describes it Co-Authored-By: Claude Opus 5.5 --- src/common/__tests__/appUrls.test.js | 8 ++- src/common/appUrls.js | 60 +++++++++---------- src/common/utils.js | 29 +++++---- .../app/ClassicTermBrowserButton.jsx | 3 +- src/components/users/UserMenu.jsx | 13 +++- 5 files changed, 61 insertions(+), 52 deletions(-) diff --git a/src/common/__tests__/appUrls.test.js b/src/common/__tests__/appUrls.test.js index 823a969c3..5bf7da044 100644 --- a/src/common/__tests__/appUrls.test.js +++ b/src/common/__tests__/appUrls.test.js @@ -54,6 +54,8 @@ test('TBv2 path: shared pages keep their path', () => { '/orgs/CIEL/sources/CIEL/concepts/1066', '/orgs/CIEL/sources/CIEL/v2026-10-01/mappings/123', '/orgs/CIEL/sources/CIEL/about', + '/orgs/CIEL/sources/CIEL/summary', + '/orgs/CIEL/sources/CIEL/v1/summary', '/users/admin/collections/vs/references', '/users/admin/collections/vs/v1/expansions/autoexpand-v1/concepts/1066', ] @@ -73,9 +75,11 @@ test('TBv2 path: pages TBv2 lacks fall back to the nearest page it has', () => { assert.equal(toTBv2Path('/orgs/CIEL/url-registry'), '/orgs/CIEL') assert.equal(toTBv2Path('/users/admin/map-projects'), '/users/admin') assert.equal(toTBv2Path('/users/admin/usage'), '/users/admin') - assert.equal(toTBv2Path('/orgs/CIEL/sources/CIEL/summary'), '/orgs/CIEL/sources/CIEL') - assert.equal(toTBv2Path('/orgs/CIEL/sources/CIEL/v1/summary'), '/orgs/CIEL/sources/CIEL/v1') + assert.equal(toTBv2Path('/orgs/new'), '/') + assert.equal(toTBv2Path('/orgs/o/collections/c/summary'), '/orgs/o/collections/c') + assert.equal(toTBv2Path('/orgs/o/collections/c/v1/summary'), '/orgs/o/collections/c/v1') assert.equal(toTBv2Path('/orgs/CIEL/sources/CIEL/edit'), '/orgs/CIEL/sources/CIEL') + assert.equal(toTBv2Path('/orgs/CIEL/sources/CIEL/edit/2'), '/orgs/CIEL/sources/CIEL') assert.equal(toTBv2Path('/orgs/CIEL/sources/CIEL/compare-versions'), '/orgs/CIEL/sources/CIEL') assert.equal(toTBv2Path('/orgs/CIEL/sources/CIEL/v%201/concepts'), '/orgs/CIEL/sources/CIEL') }) diff --git a/src/common/appUrls.js b/src/common/appUrls.js index eda666a64..7e385cc80 100644 --- a/src/common/appUrls.js +++ b/src/common/appUrls.js @@ -1,3 +1,5 @@ +import { parseRepoPath } from './repoRoute.js' + const OFFICIAL_ORIGIN = /^https:\/\/app\.(v3\.)?([a-z]+\.)*openconceptlab\.org$/ // TBv3 is at app.v3. and TBv2 at app.v2. (OpenConceptLab/ocl_online#236); app. serves one of them. @@ -31,22 +33,25 @@ const isRouteId = segment => Boolean(segment) && ROUTE_ID.test(segment) const SHARED_ROOT_PATHS = ['/search', '/imports', '/concepts/compare', '/mappings/compare'] const SHARED_OWNER_PATHS = {users: ['settings'], orgs: ['edit']} -const SHARED_REPO_TABS = ['concepts', 'mappings', 'references', 'versions', 'about'] -// The only tabs TBv2 opens a resource in, and the only ones it scopes to an expansion. -const RESOURCE_TABS = ['concepts', 'mappings'] -// What TBv3 may put right after a repository. Anything else there is a version. -const REPO_KEYWORDS = [...SHARED_REPO_TABS, 'summary', 'edit', 'compare-versions', 'expansions'] +const TBV3_ONLY_OWNER_IDS = ['new'] +const TBV3_ONLY_REPO_PAGES = ['edit', 'compare-versions'] +const TBV2_REPO_TABS = { + sources: ['concepts', 'mappings', 'versions', 'about', 'summary'], + collections: ['concepts', 'mappings', 'references', 'versions', 'about'], +} +const TBV2_RESOURCE_TABS = ['concepts', 'mappings'] export const toTBv2Path = path => { - const segments = (path || '').split(/[?#]/)[0].split('/').filter(Boolean) + const pathname = (path || '').split(/[?#]/)[0] + const segments = pathname.split('/').filter(Boolean) const fullPath = '/' + segments.join('/') if(SHARED_ROOT_PATHS.includes(fullPath)) return fullPath - const [ownerType, owner, repoType, repo, ...rest] = segments + const [ownerType, owner, repoType, repo] = segments - if(!['users', 'orgs'].includes(ownerType) || !isRouteId(owner)) + if(!['users', 'orgs'].includes(ownerType) || !isRouteId(owner) || TBV3_ONLY_OWNER_IDS.includes(owner)) return '/' const ownerHome = `/${ownerType}/${owner}` @@ -57,33 +62,22 @@ export const toTBv2Path = path => { if(!['sources', 'collections'].includes(repoType) || !isRouteId(repo)) return ownerHome - let base = `${ownerHome}/${repoType}/${repo}` - let index = 0 - - const version = rest[index] && !REPO_KEYWORDS.includes(rest[index]) ? rest[index] : '' - if(version) { - if(!isRouteId(version)) - return base - base = `${base}/${version}` - index += 1 - } - - let expansion = '' - if(rest[index] === 'expansions') { - expansion = rest[index + 1] - index += 2 - } - - const tab = rest[index] - if(!SHARED_REPO_TABS.includes(tab)) + const route = parseRepoPath(pathname) + const repoHome = `${ownerHome}/${repoType}/${repo}` + + if(TBV3_ONLY_REPO_PAGES.includes(route.version) || (route.version && !isRouteId(route.version))) + return repoHome + + const base = route.version ? `${repoHome}/${route.version}` : repoHome + + if(!TBV2_REPO_TABS[repoType].includes(route.tab)) return base - if(!RESOURCE_TABS.includes(tab)) - return `${base}/${tab}` + if(!TBV2_RESOURCE_TABS.includes(route.tab)) + return `${base}/${route.tab}` - // TBv2 scopes an expansion to a version, so one without names HEAD - const tabPath = isRouteId(expansion) ? `${base}${version ? '' : '/HEAD'}/expansions/${expansion}/${tab}` : `${base}/${tab}` - const resource = rest[index + 1] + const scope = isRouteId(route.expansion) ? `${route.version ? base : `${repoHome}/HEAD`}/expansions/${route.expansion}` : base + const tabPath = `${scope}/${route.tab}` - return isRouteId(resource) ? `${tabPath}/${resource}` : tabPath + return isRouteId(route.resource) ? `${tabPath}/${route.resource}` : tabPath } diff --git a/src/common/utils.js b/src/common/utils.js index 27cd7abeb..7c78d0b9e 100644 --- a/src/common/utils.js +++ b/src/common/utils.js @@ -1092,33 +1092,30 @@ export const getMapperURL = () => resolveMapperURL(window.MAPPER_URL || process. export const hasMapper = () => Boolean(getMapperURL()) -export const toMapperURL = path => { - const url = getMapperURL() +export const getTBv2URL = () => resolveTBv2URL(window.TBV2_URL || process.env.TBV2_URL, window.location.origin) - let referrerParams = `referrer=${window.location.href}` +const toSiblingAppURL = (url, path) => { + let referrerParams = `referrer=${window.location.href.split(/[?#]/)[0]}` if(isLoggedIn()) referrerParams += '?auth=true' - return `${url}/#${path || '/'}?${referrerParams}` + return `${url}/#${path}?${referrerParams}` } -// The same page in TBv2, or '' when this deployment has no TBv2 -export const toTBv2URL = path => { - const url = resolveTBv2URL(window.TBV2_URL || process.env.TBV2_URL, window.location.origin) - if(!url) - return '' - - // TBv2 reads auth only from the segment after the first '?' in the referrer, so drop this page's own query - let referrerParams = `referrer=${window.location.href.split(/[?#]/)[0]}` - if(isLoggedIn()) - referrerParams += '?auth=true' +export const toMapperURL = path => toSiblingAppURL(getMapperURL(), path || '/') - return `${url}/#${toTBv2Path(path)}?${referrerParams}` +export const toTBv2URL = path => { + const url = getTBv2URL() + return url ? toSiblingAppURL(url, toTBv2Path(path)) : '' } +const isUnder = (url, base) => Boolean(base) && (url === base || url.startsWith(`${base}/`)) + export const isMapperURL = url => { if(!url) return false + if(isUnder(url, getMapperURL())) + return true if(url.startsWith('http://localhost:4004')) return true if(!url.includes('.openconceptlab.org')) @@ -1131,6 +1128,8 @@ export const isMapperURL = url => { export const isV2URL = url => { if(!url) return false + if(isUnder(url, getTBv2URL())) + return true if(url.startsWith('http://localhost:4000')) return true if(!url.includes('.openconceptlab.org')) diff --git a/src/components/app/ClassicTermBrowserButton.jsx b/src/components/app/ClassicTermBrowserButton.jsx index 34687aa03..492e7f98c 100644 --- a/src/components/app/ClassicTermBrowserButton.jsx +++ b/src/components/app/ClassicTermBrowserButton.jsx @@ -18,12 +18,13 @@ const ClassicTermBrowserButton = () => { return null; return ( - + } label={t('common.classic_termbrowser')} // The header's right column can't fit the chip beside + and the account button on a phone, nor its diff --git a/src/components/users/UserMenu.jsx b/src/components/users/UserMenu.jsx index 214e0a4c2..9c790e1f8 100644 --- a/src/components/users/UserMenu.jsx +++ b/src/components/users/UserMenu.jsx @@ -16,17 +16,19 @@ import CommunityIcon from '@mui/icons-material/GroupsOutlined'; import SettingsIcon from '@mui/icons-material/SettingsOutlined'; import find from 'lodash/find'; import { useLocation } from 'react-router-dom' -import { getCurrentUser, logoutUser, isLoggedIn, getLoginURL, getRegisterURL } from '../../common/utils' +import { getCurrentUser, logoutUser, isLoggedIn, getLoginURL, getRegisterURL, toTBv2URL } from '../../common/utils' import { LANGUAGES, COMMUNITY_SITE_URL } from '../../common/constants'; import Button from '../common/Button'; import Link from '../common/Link'; import Drawer from '../common/Drawer'; import UserProfileButton from './UserProfileButton'; import CloseIconButton from '../common/CloseIconButton'; +import ClassicOCLLogo from '../common/ClassicOCLLogo'; const UserMenu = ({ isOpen, onClose }) => { const { t, i18n } = useTranslation() const location = useLocation() + const tbv2URL = toTBv2URL(location.pathname) const [languageOpen, setLanguageOpen] = React.useState(false) const selectedLanguage = find(LANGUAGES, {locale: i18n.language}) || {locale: i18n.language, name: i18n.language} const authenticated = isLoggedIn() @@ -108,6 +110,15 @@ const UserMenu = ({ isOpen, onClose }) => {
+ { + tbv2URL && + + + + + + + } From e9fe7c99fd9a08d467b654118cfee039370acc8b Mon Sep 17 00:00:00 2001 From: Sunny Aggarwal Date: Tue, 17 Nov 2026 09:39:17 +0530 Subject: [PATCH 5/5] OpenConceptLab/ocl_issues#3039 | Default TBV2_URL and MAPPER_URL to the local apps in docker-compose Co-Authored-By: Claude Opus 5.5 --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 7334bc23d..f5e75679e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -18,8 +18,8 @@ services: - ANALYTICS_API=${ANALYTICS_API-} - AI_ASSISTANT_API_URL=${AI_ASSISTANT_API_URL-} - OCL_ONLINE_API_URL=${OCL_ONLINE_API_URL-} - - MAPPER_URL=${MAPPER_URL-} - - TBV2_URL=${TBV2_URL-} + - MAPPER_URL=${MAPPER_URL-http://localhost:4004} + - TBV2_URL=${TBV2_URL-http://localhost:4000} - ERRBIT_URL - ERRBIT_KEY - HOTJAR_ID