From bce75e28e1307078a4445cb8c1ddf1068ae41aa8 Mon Sep 17 00:00:00 2001
From: Sunny Aggarwal <sny.aggarwal@gmail.com>
Date: Fri, 30 Oct 2026 09:23:35 +0530
Subject: [PATCH 01/14] OpenConceptLab/ocl_online#418 | Unified navigation:
 shared tray, + menu and Mapping Projects profile tab

---
 Dockerfile                                    |   2 +-
 docker-compose.yml                            |   2 +-
 package.json                                  |   4 +-
 src/common/navigation.js                      |  12 ++
 src/common/utils.js                           |  19 +--
 src/components/app/App.jsx                    |   6 +-
 src/components/app/DocumentTitle.jsx          |   2 +-
 src/components/app/Header.jsx                 |   6 +-
 src/components/app/HeaderControls.jsx         |  20 ++-
 src/components/app/HeaderSearch.jsx           |  31 +++++
 src/components/app/LeftMenu.jsx               | 126 +++++++-----------
 src/components/common/OCLLogo.jsx             |   5 +-
 src/components/map-projects/MapProject.jsx    |  14 +-
 .../map-projects/MapProjectBreadcrumb.jsx     |  21 +++
 .../map-projects/MapProjectsRedirect.jsx      |  18 +++
 src/components/users/AddMenuList.jsx          |  46 +++++++
 src/i18n/locales/en/translations.json         |  15 ++-
 src/i18n/locales/es/translations.json         |  15 ++-
 src/i18n/locales/pt-BR/translations.json      |  15 ++-
 src/i18n/locales/zh/translations.json         |  12 +-
 start-prod.sh                                 |   6 +-
 webpack.config.js                             |   2 +-
 22 files changed, 270 insertions(+), 129 deletions(-)
 create mode 100644 src/common/navigation.js
 create mode 100644 src/components/app/HeaderSearch.jsx
 create mode 100644 src/components/map-projects/MapProjectBreadcrumb.jsx
 create mode 100644 src/components/map-projects/MapProjectsRedirect.jsx
 create mode 100644 src/components/users/AddMenuList.jsx

diff --git a/Dockerfile b/Dockerfile
index ba941e20..cc9fddf4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,6 @@
 FROM node:22 as build
 ARG NODE_ENV=production
 ARG NODE_OPTIONS=--max_old_space_size=700
-ENV OCL_ONLINE=${OCL_ONLINE}
 ENV BRIDGE_MATCH_URL=${BRIDGE_MATCH_URL:-''}
 ENV NPM_CONFIG_LOGLEVEL warn
 ENV WEB_PORT=${WEB_PORT:-4004}
@@ -16,6 +15,7 @@ ENV OIDC_RP_CLIENT_ID=${OIDC_RP_CLIENT_ID}
 ENV OIDC_SERVER_URL=${OIDC_SERVER_URL}
 ENV OIDC_REALM=${OIDC_REALM}
 ENV OCL_ONLINE_API_URL=${OCL_ONLINE_API_URL}
+ENV TERMBROWSER_URL=${TERMBROWSER_URL}
 ENV SCISPACY_LOINC_API_URL=${SCISPACY_LOINC_API_URL}
 ENV REPO_SUGGESTIONS=${REPO_SUGGESTIONS}
 RUN mkdir /app
diff --git a/docker-compose.yml b/docker-compose.yml
index 514ea2ac..1d7215af 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -19,9 +19,9 @@ services:
       - ERRBIT_URL
       - ERRBIT_KEY
       - HOTJAR_ID
-      - OCL_ONLINE=${OCL_ONLINE-false}
       - BRIDGE_MATCH_URL
       - AI_ASSISTANT_API_URL
       - SCISPACY_LOINC_API_URL
       - OCL_ONLINE_API_URL
+      - TERMBROWSER_URL=${TERMBROWSER_URL-http://localhost:4002}
       - REPO_SUGGESTIONS=${REPO_SUGGESTIONS}
diff --git a/package.json b/package.json
index 5ecc9de9..6e92156e 100644
--- a/package.json
+++ b/package.json
@@ -35,8 +35,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 OCL_ONLINE=${OCL_ONLINE} --env BRIDGE_MATCH_URL=${BRIDGE_MATCH_URL} --env AI_ASSISTANT_API_URL=${AI_ASSISTANT_API_URL} --env SCISPACY_LOINC_API_URL=${SCISPACY_LOINC_API_URL} --env OCL_ONLINE_API_URL=${OCL_ONLINE_API_URL} --env REPO_SUGGESTIONS=${REPO_SUGGESTIONS} --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 OCL_ONLINE=${OCL_ONLINE} --env BRIDGE_MATCH_URL=${BRIDGE_MATCH_URL} --env AI_ASSISTANT_API_URL=${AI_ASSISTANT_API_URL} --env SCISPACY_LOINC_API_URL=${SCISPACY_LOINC_API_URL} --env OCL_ONLINE_API_URL=${OCL_ONLINE_API_URL} --env REPO_SUGGESTIONS=${REPO_SUGGESTIONS} --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 BRIDGE_MATCH_URL=${BRIDGE_MATCH_URL} --env AI_ASSISTANT_API_URL=${AI_ASSISTANT_API_URL} --env SCISPACY_LOINC_API_URL=${SCISPACY_LOINC_API_URL} --env OCL_ONLINE_API_URL=${OCL_ONLINE_API_URL} --env TERMBROWSER_URL=${TERMBROWSER_URL} --env REPO_SUGGESTIONS=${REPO_SUGGESTIONS} --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 BRIDGE_MATCH_URL=${BRIDGE_MATCH_URL} --env AI_ASSISTANT_API_URL=${AI_ASSISTANT_API_URL} --env SCISPACY_LOINC_API_URL=${SCISPACY_LOINC_API_URL} --env OCL_ONLINE_API_URL=${OCL_ONLINE_API_URL} --env TERMBROWSER_URL=${TERMBROWSER_URL} --env REPO_SUGGESTIONS=${REPO_SUGGESTIONS} --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'",
     "test:integration": "node --disable-warning=MODULE_TYPELESS_PACKAGE_JSON --import ./test-integration-setup.js --test 'src/**/__integration__/**/*.test.js'",
diff --git a/src/common/navigation.js b/src/common/navigation.js
new file mode 100644
index 00000000..bf88e7bb
--- /dev/null
+++ b/src/common/navigation.js
@@ -0,0 +1,12 @@
+export const trayItems = (user, hasMapper) => [
+  {key: 'dashboard', app: 'v3', path: '/', labelKey: 'dashboard.my'},
+  {key: 'repos', app: 'v3', path: `${user?.url}repos`, labelKey: 'user.my_repositories'},
+  ...(hasMapper ? [{key: 'map-projects', app: 'v3', path: `${user?.url}map-projects`, labelKey: 'user.my_mapping_projects'}] : [])
+]
+
+export const createItems = (user, hasMapper) => [
+  {key: 'org', app: 'v3', path: '/orgs/new'},
+  {key: 'repo', app: 'v3', path: `${user?.url}repos/new`},
+  ...(hasMapper ? [{key: 'map-project', app: 'mapper', path: '/map-projects/new'}] : []),
+  {key: 'import', app: 'v3', path: '/imports', divider: true}
+]
diff --git a/src/common/utils.js b/src/common/utils.js
index c4a72eab..914070f5 100644
--- a/src/common/utils.js
+++ b/src/common/utils.js
@@ -1093,20 +1093,23 @@ export const highlightTexts = (items, texts, unmark=false, additionalTexts) => {
 
 export const pluralize = (count, singular, plural) => `${count?.toLocaleString()} ${count === 1 ? singular : plural}`;
 
-export const toV3URL = path => {
-  let url = 'https://app.v3.openconceptlab.org'
+export const getV3URL = () => {
+  const configured = (window.TERMBROWSER_URL || process.env.TERMBROWSER_URL || '').trim().replace(/\/+$/, '')
+  if(configured)
+    return configured
   if(window.location.host?.includes('localhost'))
-    url = 'http://localhost:4002'
-  if(['map.dev.openconceptlab.org', 'map.demo.openconceptlab.org'].includes(window.location.host))
-    url = 'https://app.v3.qa.openconceptlab.org'
-  if(window.location.host.match('map.*.openconceptlab.org'))
-    url = window.location.origin.replace('//map.', '//app.v3.')
+    return 'http://localhost:4002'
+  if(/^https:\/\/map\.([a-z]+\.)*openconceptlab\.org$/.test(window.location.origin))
+    return window.location.origin.replace('//map.', '//app.v3.')
+  return 'https://app.v3.openconceptlab.org'
+}
 
+export const toV3URL = path => {
   let referrerParams = `referrer=${window.location.href}`
   if(isLoggedIn())
     referrerParams += '?auth=true'
 
-  return `${url}/#${path || '/'}?${referrerParams}`
+  return `${getV3URL()}/#${path || '/'}?${referrerParams}`
 }
 
 export const isV3URL = url => {
diff --git a/src/components/app/App.jsx b/src/components/app/App.jsx
index 977140ea..adc65901 100644
--- a/src/components/app/App.jsx
+++ b/src/components/app/App.jsx
@@ -26,7 +26,7 @@ import OIDLoginCallback from '../users/OIDLoginCallback';
 import { OperationsContext } from './LayoutContext';
 import Alert from '../common/Alert';
 import MapProjectRoute from '../map-projects/MapProjectRoute'
-import MapProjects from '../map-projects/MapProjects'
+import MapProjectsRedirect from '../map-projects/MapProjectsRedirect'
 import { useTranslation } from 'react-i18next';
 
 const AuthenticationRequiredRoute = ({component: Component, ...rest}) => {
@@ -164,8 +164,8 @@ const App = props => {
                 <Switch>
                   <Route exact path="/signin" component={SigninRedirect} />
                   <Route exact path="/oidc/login" component={OIDLoginCallback} />
-                  <AuthenticationRequiredRoute exact path='/' component={MapProjects} />
-                  <AuthenticationRequiredRoute exact path='/map-projects' component={MapProjects} />
+                  <AuthenticationRequiredRoute exact path='/' component={MapProjectsRedirect} />
+                  <AuthenticationRequiredRoute exact path='/map-projects' component={MapProjectsRedirect} />
                   <AuthenticationRequiredRoute exact path='/map-projects/new' component={MapProjectRoute} />
                   <AuthenticationRequiredRoute exact path='/:ownerType/:owner/map-projects/:projectId' component={MapProjectRoute} />
                   <Route exact path='/403' component={Error403} />
diff --git a/src/components/app/DocumentTitle.jsx b/src/components/app/DocumentTitle.jsx
index 70ec0dd0..cd351987 100644
--- a/src/components/app/DocumentTitle.jsx
+++ b/src/components/app/DocumentTitle.jsx
@@ -5,7 +5,7 @@ import { getSiteTitle } from '../../common/utils';
 
 const SITE_TITLE = getSiteTitle()
 
-export const getAppTitle = () => `${getSiteTitle()} Mapper`
+export const getAppTitle = () => getSiteTitle()
 
 /*eslint no-useless-escape: 0*/
 const TITLES = {
diff --git a/src/components/app/Header.jsx b/src/components/app/Header.jsx
index 2489e1c7..ae761c86 100644
--- a/src/components/app/Header.jsx
+++ b/src/components/app/Header.jsx
@@ -12,6 +12,7 @@ import { getCurrentUser } from '../../common/utils';
 import './Header.scss';
 import HeaderControls from './HeaderControls';
 import LeftMenu from './LeftMenu'
+import HeaderSearch from './HeaderSearch'
 import AnnouncementBanner from './AnnouncementBanner';
 
 
@@ -64,7 +65,10 @@ const Header = props => {
               }
               <OCLLogo />
             </div>
-            <div className='col-xs-8' />
+            <div className='col-xs-3' />
+            <div className='col-xs-4 padding-0' style={{textAlign: 'center'}}>
+              {Boolean(user?.url) && <HeaderSearch />}
+            </div>
             <HeaderControls />
           </div>
         </Toolbar>
diff --git a/src/components/app/HeaderControls.jsx b/src/components/app/HeaderControls.jsx
index ce0d1f73..64e43496 100644
--- a/src/components/app/HeaderControls.jsx
+++ b/src/components/app/HeaderControls.jsx
@@ -1,14 +1,32 @@
 import React from 'react';
+import IconButton from '@mui/material/IconButton'
+import AddIcon from '@mui/icons-material/Add'
 import UserMenu from '../users/UserMenu';
 import UserProfileButton from '../users/UserProfileButton';
+import AddMenuList from '../users/AddMenuList'
+import { isLoggedIn } from '../../common/utils';
 
 
 const HeaderControls = () => {
   const [userMenu, setUserMenu] = React.useState(false)
+  const [addMenuAnchorEl, setAddMenuAnchorEl] = React.useState(null)
+
+  const authenticated = isLoggedIn()
+
   return (
-    <div className='col-xs-3 padding-0' style={{textAlign: 'right'}}>
+    <div className='col-xs-4 padding-0' style={{textAlign: 'right'}}>
+      {
+        authenticated &&
+          <IconButton sx={{marginRight: '8px'}} aria-label='create' onClick={event => setAddMenuAnchorEl(event.currentTarget)}>
+            <AddIcon />
+          </IconButton>
+      }
       <UserProfileButton onClick={() => setUserMenu(true)} />
       <UserMenu isOpen={userMenu} onClose={() => setUserMenu(false)} />
+      {
+        authenticated &&
+          <AddMenuList open={Boolean(addMenuAnchorEl)} onClose={() => setAddMenuAnchorEl(null)} anchorEl={addMenuAnchorEl} />
+      }
     </div>
   )
 }
diff --git a/src/components/app/HeaderSearch.jsx b/src/components/app/HeaderSearch.jsx
new file mode 100644
index 00000000..c690b457
--- /dev/null
+++ b/src/components/app/HeaderSearch.jsx
@@ -0,0 +1,31 @@
+import React from 'react';
+import { useTranslation } from 'react-i18next'
+import InputAdornment from '@mui/material/InputAdornment';
+import TextField from '@mui/material/TextField';
+import SearchIcon from '@mui/icons-material/Search';
+import { getV3URL } from '../../common/utils';
+
+const HeaderSearch = () => {
+  const { t } = useTranslation()
+  const [value, setValue] = React.useState('')
+
+  const onKeyDown = event => {
+    const query = value.trim()
+    if(event.key === 'Enter' && query)
+      window.location.assign(`${getV3URL()}/search/?q=${encodeURIComponent(query)}&type=concepts`)
+  }
+
+  return (
+    <TextField
+      size='small'
+      fullWidth
+      value={value}
+      placeholder={t('search.input_placeholder')}
+      onChange={event => setValue(event.target.value)}
+      onKeyDown={onKeyDown}
+      InputProps={{startAdornment: <InputAdornment position='start'><SearchIcon /></InputAdornment>, sx: {borderRadius: '100px'}}}
+    />
+  )
+}
+
+export default HeaderSearch
diff --git a/src/components/app/LeftMenu.jsx b/src/components/app/LeftMenu.jsx
index 56d0120f..5fe32a24 100644
--- a/src/components/app/LeftMenu.jsx
+++ b/src/components/app/LeftMenu.jsx
@@ -17,9 +17,16 @@ import { getCurrentUser, refreshCurrentUserCache, getCurrentUserOrgs, toV3URL }
 import Drawer from '../common/Drawer';
 import OrgIcon from '../orgs/OrgIcon';
 import EntityIcon from '../common/EntityIcon'
-import MapperQuotaChip from '../map-projects/MapperQuotaChip'
+import { trayItems } from '../../common/navigation'
+import Button from '@mui/material/Button';
 
 
+const TRAY_ICONS = {
+  dashboard: selected => <DashboardIcon color={selected ? 'primary' : undefined} />,
+  repos: selected => <FolderOpenIcon color={selected ? 'primary' : undefined} />,
+  'map-projects': selected => <i style={{fontSize: '1.25rem', color: selected ? PRIMARY_COLORS.main : undefined}} className="fa-solid fa-diagram-project"></i>
+}
+
 const DrawerHeader = styled('div')(({ theme }) => ({
   display: 'flex',
   alignItems: 'center',
@@ -60,88 +67,53 @@ const LeftMenu = ({ isOpen, onClose }) => {
         </Typography>
       </DrawerHeader>
       <List sx={{p: 0}}>
-        <ListItem disablePadding sx={{ display: 'block' }}>
-          <ListItemButton
-            onClick={onClose}
-            href={toV3URL()}
-            className='no-anchor-styles'
-            sx={{
-              minHeight: 56,
-              justifyContent: 'initial',
-              px: 2,
-              borderRadius: '100px'
-            }}
-          >
-            <ListItemIcon
-              sx={{
-                minWidth: 0,
-                mr: 1.75,
-                justifyContent: 'center',
-              }}
-            >
-              <DashboardIcon />
-            </ListItemIcon>
-            <ListItemText primary={t('dashboard.my')} />
-          </ListItemButton>
-        </ListItem>
-        <ListItem disablePadding sx={{ display: 'block' }}>
-          <ListItemButton
-            onClick={onClose}
-            sx={{
-              minHeight: 56,
-              justifyContent: 'initial',
-              px: 2,
-              borderRadius: '100px'
-            }}
-            href={toV3URL(user?.url + 'repos')}
-            className='no-anchor-styles'
-            selected={location.pathname === (user?.url + 'repos')}
-          >
-            <ListItemIcon
-              sx={{
-                minWidth: 0,
-                mr: 1.75,
-                justifyContent: 'center',
-              }}
-            >
-              <FolderOpenIcon color={location.pathname === (user?.url + 'repos') ? 'primary' : undefined} />
-            </ListItemIcon>
-            <ListItemText primary={t('user.my_repositories')} />
-            <span><b>{((user?.collections || 0) + (user?.sources + 0)).toLocaleString()}</b></span>
-          </ListItemButton>
-        </ListItem>
-        <ListItem disablePadding sx={{ display: 'block' }}>
-          <ListItemButton
-            onClick={onClose}
-            sx={{
-              minHeight: 56,
-              justifyContent: 'initial',
-              px: 2,
-              borderRadius: '100px'
-            }}
-            href='/'
-            className='no-anchor-styles'
-            selected={location.pathname === '/'}
-          >
-            <ListItemIcon
-              sx={{
-                minWidth: 0,
-                mr: 1.75,
-                justifyContent: 'center',
-              }}
-            >
-              <i style={{fontSize: '1.25rem', color: location.pathname === '/' ?  PRIMARY_COLORS.main : undefined}} className="fa-solid fa-diagram-project"></i>
-            </ListItemIcon>
-            <ListItemText primary={t('user.my_mapping_projects')} />
-            <MapperQuotaChip />
-          </ListItemButton>
-        </ListItem>
+        {
+          trayItems(user, true).map(item => {
+            const selected = location.pathname === item.path
+            return (
+              <ListItem key={item.key} disablePadding sx={{ display: 'block' }}>
+                <ListItemButton
+                  onClick={onClose}
+                  href={toV3URL(item.path)}
+                  className='no-anchor-styles'
+                  selected={selected}
+                  sx={{
+                    minHeight: 56,
+                    justifyContent: 'initial',
+                    px: 2,
+                    borderRadius: '100px'
+                  }}
+                >
+                  <ListItemIcon
+                    sx={{
+                      minWidth: 0,
+                      mr: 1.75,
+                      justifyContent: 'center',
+                    }}
+                  >
+                    {TRAY_ICONS[item.key](selected)}
+                  </ListItemIcon>
+                  <ListItemText primary={t(item.labelKey)} />
+                  {
+                    item.key === 'repos' &&
+                      <span><b>{((user?.collections || 0) + (user?.sources + 0)).toLocaleString()}</b></span>
+                  }
+                </ListItemButton>
+              </ListItem>
+            )
+          })
+        }
       </List>
       <Divider style={{width: '100%', marginTop: '16px'}} />
       <List sx={{maxHeight: '300px', overflow: 'auto', p: 0}} dense>
         <ListItem
           disablePadding
           sx={{ display: 'block', padding: 1, borderRadius: '100px' }}
+          secondaryAction={
+            <Button edge="end" aria-label={t('common.create')} variant='text' color='primary' href={toV3URL('/orgs/new')} onClick={onClose} sx={{textTransform: 'none'}}>
+              <b>{t('common.create')}</b>
+            </Button>
+          }
         >
           <ListItemText
             primary={
diff --git a/src/components/common/OCLLogo.jsx b/src/components/common/OCLLogo.jsx
index 37d4368c..4260f9cd 100644
--- a/src/components/common/OCLLogo.jsx
+++ b/src/components/common/OCLLogo.jsx
@@ -1,11 +1,12 @@
 import React from 'react';
 import SvgIcon from '@mui/material/SvgIcon';
 import { PRIMARY_COLORS } from '../../common/colors'
+import { toV3URL } from '../../common/utils'
 
 const OCLLogo = ({ color, width, height, }) => {
   return (
-    <a className='hover-no-bg-color flex-vertical-center' href='/'>
-      <SvgIcon sx={{color: 'primary.main', fill: color || PRIMARY_COLORS.main, width: width || '84px', height: height || '28px'}} href='/'>
+    <a className='hover-no-bg-color flex-vertical-center' href={toV3URL()}>
+      <SvgIcon sx={{color: 'primary.main', fill: color || PRIMARY_COLORS.main, width: width || '84px', height: height || '28px'}}>
         <svg version="1.1" id="Layer_1" x="0px" y="0px" viewBox="0 0 306.14 111.63">
           <g>
 	          <g>
diff --git a/src/components/map-projects/MapProject.jsx b/src/components/map-projects/MapProject.jsx
index 61c8a1e8..4ec0ce7e 100644
--- a/src/components/map-projects/MapProject.jsx
+++ b/src/components/map-projects/MapProject.jsx
@@ -114,6 +114,7 @@ import PreviewLimitDialog from './PreviewLimitDialog'
 import QuotaDialog from '../common/QuotaDialog'
 import { getQuotaError } from '../common/quotaErrors'
 import MapperQuotaChip from './MapperQuotaChip'
+import MapProjectBreadcrumb from './MapProjectBreadcrumb'
 import { getPreviewLimitError, isAIPreviewLimitError } from './previewLimits'
 import { formatRowNumbers, rowNumberOf, runMatchBatch, requestSingleMatch, runWithConcurrency, INTERACTIVE_WAIT_CAP_MS } from './matchBatch'
 import { getAIAssistantChoices, getModelUsed, getPromptTemplateKey, createLatestRequestGate } from './aiVisibility'
@@ -779,13 +780,6 @@ const MapProject = () => {
     setColumns(prev => resuggestColumns(prev, headers))
   }, [headersKey])
 
-  React.useEffect(() => {
-    if(!isEmpty(decisions)) {
-      window.addEventListener("beforeunload", alertUser);
-      return () => window.removeEventListener("beforeunload", alertUser);
-    }
-  }, [decisions]);
-
   React.useEffect(() => {
     fetchMapTypes()
     fetchOclLocales()
@@ -1049,11 +1043,6 @@ const MapProject = () => {
     setOclLocales(sorted)
   })
 
-  const alertUser = (e) => {
-    e.preventDefault();
-    e.returnValue = "";
-  };
-
   const rowIndex = row?.__index
 
   const getColumns = row => {
@@ -6278,6 +6267,7 @@ const MapProject = () => {
             {
               !isConfigFormInline &&
                 <span style={{display: 'flex', alignItems: 'center'}}>
+                  <MapProjectBreadcrumb ownerType={params.ownerType} owner={params.owner} />
                   {
                     name &&
                       <span style={{fontWeight: 'bold', fontSize: '18px', maxWidth: isSplitView ? '300px' : '500px', overflow: 'hidden', whiteSpace: 'nowrap', textOverflow: 'ellipsis', marginRight: '8px'}}>
diff --git a/src/components/map-projects/MapProjectBreadcrumb.jsx b/src/components/map-projects/MapProjectBreadcrumb.jsx
new file mode 100644
index 00000000..eefbd6b4
--- /dev/null
+++ b/src/components/map-projects/MapProjectBreadcrumb.jsx
@@ -0,0 +1,21 @@
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+import Link from '@mui/material/Link';
+import ChevronRightIcon from '@mui/icons-material/ChevronRight';
+import { toV3URL } from '../../common/utils';
+
+const MapProjectBreadcrumb = ({ ownerType, owner }) => {
+  const { t } = useTranslation()
+  if(!ownerType || !owner)
+    return null
+  const ownerURL = `/${ownerType}/${owner}/`
+  return (
+    <span aria-label='breadcrumb' style={{display: 'flex', alignItems: 'center', fontSize: '14px', marginRight: '12px', whiteSpace: 'nowrap'}}>
+      <Link href={toV3URL(ownerURL)} underline='hover' color='inherit'>{owner}</Link>
+      <ChevronRightIcon fontSize='inherit' sx={{margin: '0 4px'}} />
+      <Link href={toV3URL(`${ownerURL}map-projects`)} underline='hover' color='inherit'>{t('map_project.mapping_projects')}</Link>
+    </span>
+  )
+}
+
+export default MapProjectBreadcrumb
diff --git a/src/components/map-projects/MapProjectsRedirect.jsx b/src/components/map-projects/MapProjectsRedirect.jsx
new file mode 100644
index 00000000..700bb82c
--- /dev/null
+++ b/src/components/map-projects/MapProjectsRedirect.jsx
@@ -0,0 +1,18 @@
+import React from 'react';
+import { getCurrentUser, toV3URL } from '../../common/utils';
+import MapProjects from './MapProjects';
+
+const MapProjectsRedirect = props => {
+  const user = getCurrentUser()
+  const blockedNewProject = Boolean(props.location?.state?.newProjectBlock)
+  const redirect = Boolean(user?.url) && !blockedNewProject
+
+  React.useEffect(() => {
+    if(redirect)
+      window.location.replace(toV3URL(`${user.url}map-projects`))
+  }, [redirect])
+
+  return redirect ? null : <MapProjects />
+}
+
+export default MapProjectsRedirect
diff --git a/src/components/users/AddMenuList.jsx b/src/components/users/AddMenuList.jsx
new file mode 100644
index 00000000..8d0ee2ac
--- /dev/null
+++ b/src/components/users/AddMenuList.jsx
@@ -0,0 +1,46 @@
+import React from 'react';
+import { useTranslation } from 'react-i18next'
+import { Menu, ListItemButton, ListItemText, ListItemIcon, Divider} from '@mui/material'
+import ImportIcon from '@mui/icons-material/Publish';
+import { getCurrentUser, toV3URL } from '../../common/utils';
+import { createItems } from '../../common/navigation';
+import OrgIcon from '../orgs/OrgIcon'
+import RepoIcon from '../repos/RepoIcon'
+
+const ITEM_SX = {padding: '8px 12px', '&:hover': {color: 'inherit'}, '&:focus': {outline: 'none', textDecoration: 'none', color: 'inherit'}}
+
+const CREATE_ITEM_IDS = {org: 'addOrg', repo: 'addRepo', 'map-project': 'addMapProject', import: 'bulkImport'}
+const CREATE_ITEM_LABELS = {org: 'org.org', repo: 'repo.repo', 'map-project': 'map_project.mapping_project', import: 'import.bulk_import'}
+const CREATE_ITEM_ICONS = {
+  org: <OrgIcon noTooltip noLink strict />,
+  repo: <RepoIcon noTooltip />,
+  'map-project': <i style={{fontSize: '1.25rem'}} className="fa-solid fa-diagram-project"></i>,
+  import: <ImportIcon />
+}
+
+const AddMenuList = ({ anchorEl, open, onClose }) => {
+  const { t } = useTranslation()
+  const user = getCurrentUser()
+  return (
+    <Menu
+      id='user-add-menu-list'
+      anchorEl={anchorEl}
+      open={open}
+      onClose={onClose}
+      sx={{'.MuiPaper-root': {backgroundColor: 'surface.n94', minWidth: '200px'}}}
+    >
+      {
+        createItems(user, true).flatMap(item => [
+          item.divider && <Divider key={`${item.key}-divider`} />,
+          <ListItemButton key={item.key} id={CREATE_ITEM_IDS[item.key]} href={item.app === 'v3' ? toV3URL(item.path) : item.path} sx={ITEM_SX} onClick={onClose}>
+            <ListItemIcon sx={{minWidth: 'auto', marginRight: '12px'}}>
+              {CREATE_ITEM_ICONS[item.key]}
+            </ListItemIcon>
+            <ListItemText primary={t(CREATE_ITEM_LABELS[item.key])} />
+          </ListItemButton>
+        ])
+      }
+    </Menu>
+  )
+}
+export default AddMenuList;
diff --git a/src/i18n/locales/en/translations.json b/src/i18n/locales/en/translations.json
index 39068698..191b92b6 100644
--- a/src/i18n/locales/en/translations.json
+++ b/src/i18n/locales/en/translations.json
@@ -62,7 +62,8 @@
     "advance_settings": "Advanced Settings",
     "remove": "Remove",
     "at": "at",
-    "none": "None"
+    "none": "None",
+    "create": "Create"
   },
   "errors": {
     "401": "Login is required",
@@ -175,7 +176,8 @@
   "org": {
     "my": "My Organizations",
     "orgs": "Organizations",
-    "members": "Members"
+    "members": "Members",
+    "org": "Organization"
   },
   "user": {
     "my_profile": "My Profile",
@@ -196,7 +198,8 @@
     "no_match_metrics": "No algorithm match metrics available for this concept.",
     "list_view": "List View",
     "table_view": "Table View",
-    "select_all_rows": "Select all rows"
+    "select_all_rows": "Select all rows",
+    "input_placeholder": "Search OCL..."
   },
   "url_registry": {
     "global_registry": "Global registry"
@@ -552,7 +555,8 @@
     "ai_recommendation_failed_retry": "OCL AI Assistant recommendation failed — click to retry",
     "ai_recommendation_running": "OCL AI Assistant recommendation running",
     "repo_url": "Repo URL",
-    "repo_version": "Repo Version"
+    "repo_version": "Repo Version",
+    "mapping_project": "Mapping project"
   },
   "app": {
     "web_version": "Web Version",
@@ -593,5 +597,8 @@
         "import": "Rows past your limit stay in the project but aren't matched."
       }
     }
+  },
+  "import": {
+    "bulk_import": "Bulk Import"
   }
 }
diff --git a/src/i18n/locales/es/translations.json b/src/i18n/locales/es/translations.json
index d8cbc4db..e46e7abb 100644
--- a/src/i18n/locales/es/translations.json
+++ b/src/i18n/locales/es/translations.json
@@ -62,7 +62,8 @@
     "checking_auth": "Verificando autenticación...",
     "remove": "Eliminar",
     "at": "a las",
-    "none": "Ninguno"
+    "none": "Ninguno",
+    "create": "Crear"
   },
   "errors": {
     "401": "Se requiere iniciar sesión",
@@ -166,7 +167,8 @@
   "org": {
     "orgs": "Organizaciones",
     "my": "Mis organizaciones",
-    "members": "Miembros"
+    "members": "Miembros",
+    "org": "Organización"
   },
   "user": {
     "my_profile": "Mi perfil",
@@ -187,7 +189,8 @@
     "no_match_metrics": "No hay métricas de coincidencia de algoritmos disponibles para este concepto.",
     "list_view": "Vista de lista",
     "table_view": "Vista de tabla",
-    "select_all_rows": "Seleccionar todas las filas"
+    "select_all_rows": "Seleccionar todas las filas",
+    "input_placeholder": "Buscar en OCL..."
   },
   "locale": {
     "add_custom_language_codes": "Agregar código(s) de idioma personalizado(s)",
@@ -540,7 +543,8 @@
     "ai_recommendation_failed_retry": "Error en la recomendación del asistente de IA de OCL — haga clic para intentar de nuevo",
     "ai_recommendation_running": "Recomendación del asistente de IA de OCL en curso",
     "repo_url": "URL del repositorio",
-    "repo_version": "Versión del repositorio"
+    "repo_version": "Versión del repositorio",
+    "mapping_project": "Proyecto de mapeo"
   },
   "app": {
     "web_version": "Versión Web",
@@ -593,5 +597,8 @@
         "import": "Las filas que superan su límite permanecen en el proyecto pero no se emparejan."
       }
     }
+  },
+  "import": {
+    "bulk_import": "Importación masiva"
   }
 }
diff --git a/src/i18n/locales/pt-BR/translations.json b/src/i18n/locales/pt-BR/translations.json
index 3540ef24..e154cd35 100644
--- a/src/i18n/locales/pt-BR/translations.json
+++ b/src/i18n/locales/pt-BR/translations.json
@@ -62,7 +62,8 @@
     "advance_settings": "Configurações avançadas",
     "remove": "Remover",
     "at": "em",
-    "none": "Nenhum"
+    "none": "Nenhum",
+    "create": "Criar"
   },
   "errors": {
     "401": "Login é necessário",
@@ -175,7 +176,8 @@
   "org": {
     "my": "Minhas Organizações",
     "orgs": "Organizações",
-    "members": "Membros"
+    "members": "Membros",
+    "org": "Organização"
   },
   "user": {
     "my_profile": "Meu Perfil",
@@ -196,7 +198,8 @@
     "no_match_metrics": "Nenhuma métrica de correspondência de algoritmo disponível para este conceito.",
     "list_view": "Visualização em Lista",
     "table_view": "Visualização em Tabela",
-    "select_all_rows": "Selecionar todas as linhas"
+    "select_all_rows": "Selecionar todas as linhas",
+    "input_placeholder": "Buscar no OCL..."
   },
   "url_registry": {
     "global_registry": "Registro Global"
@@ -552,7 +555,8 @@
     "ai_recommendation_failed_retry": "Recomendação do Assistente de IA do OCL falhou — clique para tentar novamente",
     "ai_recommendation_running": "Recomendação do Assistente de IA do OCL em execução",
     "repo_url": "URL do Repo",
-    "repo_version": "Versão do Repo"
+    "repo_version": "Versão do Repo",
+    "mapping_project": "Projeto de mapeamento"
   },
   "app": {
     "web_version": "Versão Web",
@@ -593,5 +597,8 @@
         "import": "Linhas além do seu limite permanecem no projeto mas não são correspondidas."
       }
     }
+  },
+  "import": {
+    "bulk_import": "Importação em massa"
   }
 }
diff --git a/src/i18n/locales/zh/translations.json b/src/i18n/locales/zh/translations.json
index 3852a6c6..809378bd 100644
--- a/src/i18n/locales/zh/translations.json
+++ b/src/i18n/locales/zh/translations.json
@@ -62,7 +62,8 @@
     "action": "操作",
     "remove": "移除",
     "at": "于",
-    "none": "无"
+    "none": "无",
+    "create": "创建"
   },
   "errors": {
     "401": "需要登录",
@@ -175,7 +176,8 @@
   "org": {
     "my": "我的组织机构",
     "orgs": "组织机构",
-    "members": "成员"
+    "members": "成员",
+    "org": "组织机构"
   },
   "user": {
     "my_profile": "我的个人资料",
@@ -196,7 +198,8 @@
     "no_match_metrics": "此概念没有可用的算法匹配指标。",
     "list_view": "列表视图",
     "table_view": "表格视图",
-    "select_all_rows": "选择全部行"
+    "select_all_rows": "选择全部行",
+    "input_placeholder": "搜索 OCL..."
   },
   "url_registry": {
     "global_registry": "全球注册库"
@@ -551,7 +554,8 @@
     "ai_recommendation_failed_retry": "OCL AI 助手推荐失败 — 点击重试",
     "ai_recommendation_running": "OCL AI 助手推荐进行中",
     "repo_url": "仓库 URL",
-    "repo_version": "仓库版本"
+    "repo_version": "仓库版本",
+    "mapping_project": "映射项目"
   },
   "app": {
     "web_version": "Web 版本",
diff --git a/start-prod.sh b/start-prod.sh
index 4abcc950..3de99246 100755
--- a/start-prod.sh
+++ b/start-prod.sh
@@ -38,9 +38,6 @@ fi
 if [[ ! -z "${OIDC_REALM}" ]]; then
     echo "var OIDC_REALM = \"${OIDC_REALM}\";" >> ${ENV_FILE}
 fi
-if [[ ! -z "${OCL_ONLINE}" ]]; then
-    echo "var OCL_ONLINE = \"${OCL_ONLINE}\";" >> ${ENV_FILE}
-fi
 if [[ ! -z "${BRIDGE_MATCH_URL}" ]]; then
     echo "var BRIDGE_MATCH_URL = \"${BRIDGE_MATCH_URL}\";" >> ${ENV_FILE}
 fi
@@ -50,6 +47,9 @@ fi
 if [[ ! -z "${SCISPACY_LOINC_API_URL}" ]]; then
     echo "var SCISPACY_LOINC_API_URL = \"${SCISPACY_LOINC_API_URL}\";" >> ${ENV_FILE}
 fi
+if [[ ! -z "${TERMBROWSER_URL}" ]]; then
+    echo "var TERMBROWSER_URL = \"${TERMBROWSER_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 3d6f11b1..f85cdf93 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -149,10 +149,10 @@ module.exports = (env) => {
         'process.env.OIDC_RP_CLIENT_ID': JSON.stringify(env.OIDC_RP_CLIENT_ID),
         'process.env.OIDC_SERVER_URL': JSON.stringify(env.OIDC_SERVER_URL || ''),
         'process.env.OIDC_REALM': JSON.stringify(env.OIDC_REALM || ''),
-        'process.env.OCL_ONLINE': JSON.stringify(env.OCL_ONLINE) || 'false',
         'process.env.BRIDGE_MATCH_URL': JSON.stringify(env.BRIDGE_MATCH_URL || '') || '',
         'process.env.AI_ASSISTANT_API_URL': JSON.stringify(env.AI_ASSISTANT_API_URL || '') || '',
         'process.env.SCISPACY_LOINC_API_URL': JSON.stringify(env.SCISPACY_LOINC_API_URL || '') || '',
+        'process.env.TERMBROWSER_URL': JSON.stringify(env.TERMBROWSER_URL || ''),
         'process.env.OCL_ONLINE_API_URL': JSON.stringify(env.OCL_ONLINE_API_URL || '') || '',
         'process.env.REPO_SUGGESTIONS': JSON.stringify(env.REPO_SUGGESTIONS || '')
       }),

From 9cca2abf52cfa2e7663395cc7876787a34faa5ef Mon Sep 17 00:00:00 2001
From: Sunny Aggarwal <sny.aggarwal@gmail.com>
Date: Fri, 30 Oct 2026 10:57:06 +0530
Subject: [PATCH 02/14] OpenConceptLab/ocl_online#418 | Review fixes:
 organization projects, counts, selection, configurable URLs, tests

---
 src/common/__tests__/appUrls.test.js     | 23 +++++++++++++
 src/common/__tests__/mapProjects.test.js |  9 ++++++
 src/common/__tests__/navigation.test.js  | 41 ++++++++++++++++++++++++
 src/common/appUrls.js                    | 14 ++++++++
 src/common/mapProjects.js                |  4 +++
 src/common/navigation.js                 |  9 ++++++
 src/common/utils.js                      | 12 ++-----
 src/components/app/LeftMenu.jsx          | 25 +++++++++++++--
 8 files changed, 125 insertions(+), 12 deletions(-)
 create mode 100644 src/common/__tests__/appUrls.test.js
 create mode 100644 src/common/__tests__/mapProjects.test.js
 create mode 100644 src/common/__tests__/navigation.test.js
 create mode 100644 src/common/appUrls.js
 create mode 100644 src/common/mapProjects.js

diff --git a/src/common/__tests__/appUrls.test.js b/src/common/__tests__/appUrls.test.js
new file mode 100644
index 00000000..e1a42448
--- /dev/null
+++ b/src/common/__tests__/appUrls.test.js
@@ -0,0 +1,23 @@
+import test from 'node:test'
+import assert from 'node:assert/strict'
+
+const { resolveV3URL, PRODUCTION_TERMBROWSER_URL } = await import('../appUrls.js')
+
+test('configured URL wins and loses its trailing slash', () => {
+  assert.equal(resolveV3URL('https://tb.example.org/', 'https://map.qa.openconceptlab.org', 'map.qa.openconceptlab.org'), 'https://tb.example.org')
+})
+
+test('localhost points to the local TermBrowser', () => {
+  assert.equal(resolveV3URL('', 'http://localhost:4004', 'localhost:4004'), 'http://localhost:4002')
+})
+
+test('official Mapper hosts map to the matching TermBrowser environment', () => {
+  assert.equal(resolveV3URL('', 'https://map.openconceptlab.org', 'map.openconceptlab.org'), 'https://app.v3.openconceptlab.org')
+  assert.equal(resolveV3URL('', 'https://map.qa.openconceptlab.org', 'map.qa.openconceptlab.org'), 'https://app.v3.qa.openconceptlab.org')
+  assert.equal(resolveV3URL(undefined, 'https://map.staging.who.openconceptlab.org', 'map.staging.who.openconceptlab.org'), 'https://app.v3.staging.who.openconceptlab.org')
+})
+
+test('custom hosts without configuration point to production', () => {
+  assert.equal(resolveV3URL('', 'https://mapper.example.org', 'mapper.example.org'), PRODUCTION_TERMBROWSER_URL)
+  assert.equal(resolveV3URL('', undefined, undefined), PRODUCTION_TERMBROWSER_URL)
+})
diff --git a/src/common/__tests__/mapProjects.test.js b/src/common/__tests__/mapProjects.test.js
new file mode 100644
index 00000000..f15897ff
--- /dev/null
+++ b/src/common/__tests__/mapProjects.test.js
@@ -0,0 +1,9 @@
+import test from 'node:test'
+import assert from 'node:assert/strict'
+
+const { projectCount } = await import('../mapProjects.js')
+
+test('projectCount sums num_found across user and organization lists', () => {
+  assert.equal(projectCount({headers: {num_found: '4'}}, {headers: {num_found: '3'}}), 7)
+  assert.equal(projectCount({headers: {}}, undefined), 0)
+})
diff --git a/src/common/__tests__/navigation.test.js b/src/common/__tests__/navigation.test.js
new file mode 100644
index 00000000..7b5fd72e
--- /dev/null
+++ b/src/common/__tests__/navigation.test.js
@@ -0,0 +1,41 @@
+import test from 'node:test'
+import assert from 'node:assert/strict'
+
+const { trayItems, createItems } = await import('../navigation.js')
+
+const user = {url: '/users/test/'}
+
+test('tray lists dashboard, repositories and mapping projects', () => {
+  assert.deepEqual(trayItems(user, true).map(i => [i.key, i.path]), [
+    ['dashboard', '/'],
+    ['repos', '/users/test/repos'],
+    ['map-projects', '/users/test/map-projects'],
+  ])
+})
+
+test('tray omits mapping projects without a mapper', () => {
+  assert.deepEqual(trayItems(user, false).map(i => i.key), ['dashboard', 'repos'])
+})
+
+test('create menu sends the mapping project to the mapper app', () => {
+  const items = createItems(user, true)
+  assert.equal(items.find(i => i.key === 'map-project').app, 'mapper')
+  assert.equal(createItems(user, false).some(i => i.key === 'map-project'), false)
+  assert.equal(items.find(i => i.key === 'import').divider, true)
+})
+
+const { isTrayItemSelected } = await import('../navigation.js')
+
+test('mapping projects stays selected on a project page', () => {
+  const item = trayItems(user, true).find(i => i.key === 'map-projects')
+  assert.equal(isTrayItemSelected(item, '/users/test/map-projects'), true)
+  assert.equal(isTrayItemSelected(item, '/users/test/map-projects/'), true)
+  assert.equal(isTrayItemSelected(item, '/users/test/map-projects/123/'), true)
+  assert.equal(isTrayItemSelected(item, '/users/test/repos'), false)
+})
+
+test('dashboard is selected only on the root path', () => {
+  const item = trayItems(user, true).find(i => i.key === 'dashboard')
+  assert.equal(isTrayItemSelected(item, '/'), true)
+  assert.equal(isTrayItemSelected(item, '/users/test/map-projects'), false)
+})
diff --git a/src/common/appUrls.js b/src/common/appUrls.js
new file mode 100644
index 00000000..4ffedd67
--- /dev/null
+++ b/src/common/appUrls.js
@@ -0,0 +1,14 @@
+export const PRODUCTION_TERMBROWSER_URL = 'https://app.v3.openconceptlab.org'
+
+const OFFICIAL_MAPPER_ORIGIN = /^https:\/\/map\.([a-z]+\.)*openconceptlab\.org$/
+
+export const resolveV3URL = (configured, origin, host) => {
+  const url = (configured || '').trim().replace(/\/+$/, '')
+  if(url)
+    return url
+  if(host?.includes('localhost'))
+    return 'http://localhost:4002'
+  if(OFFICIAL_MAPPER_ORIGIN.test(origin || ''))
+    return origin.replace('//map.', '//app.v3.')
+  return PRODUCTION_TERMBROWSER_URL
+}
diff --git a/src/common/mapProjects.js b/src/common/mapProjects.js
new file mode 100644
index 00000000..822cd1ee
--- /dev/null
+++ b/src/common/mapProjects.js
@@ -0,0 +1,4 @@
+export const projectCount = (...responses) => responses.reduce(
+  (total, response) => total + (parseInt(response?.headers?.num_found) || 0),
+  0
+)
diff --git a/src/common/navigation.js b/src/common/navigation.js
index bf88e7bb..9eec4cac 100644
--- a/src/common/navigation.js
+++ b/src/common/navigation.js
@@ -10,3 +10,12 @@ export const createItems = (user, hasMapper) => [
   ...(hasMapper ? [{key: 'map-project', app: 'mapper', path: '/map-projects/new'}] : []),
   {key: 'import', app: 'v3', path: '/imports', divider: true}
 ]
+
+export const isTrayItemSelected = (item, pathname) => {
+  if(!pathname)
+    return false
+  if(item.key === 'dashboard')
+    return pathname === item.path
+  const base = item.path.replace(/\/+$/, '')
+  return pathname === base || pathname === `${base}/` || pathname.startsWith(`${base}/`)
+}
diff --git a/src/common/utils.js b/src/common/utils.js
index 914070f5..e63d6781 100644
--- a/src/common/utils.js
+++ b/src/common/utils.js
@@ -18,6 +18,7 @@ import GAService from '../services/GAService';
 import { ensureIdToken, prepareSignOut, settleForcedSignOut, renewSessionSilently } from './ssoSession';
 import { SERVER_CONFIGS } from './serverConfigs';
 import { legacyHashRoute, isSameSitePath } from './history';
+import { resolveV3URL } from './appUrls';
 
 export const currentPath = () => window.location.pathname;
 
@@ -1093,16 +1094,7 @@ export const highlightTexts = (items, texts, unmark=false, additionalTexts) => {
 
 export const pluralize = (count, singular, plural) => `${count?.toLocaleString()} ${count === 1 ? singular : plural}`;
 
-export const getV3URL = () => {
-  const configured = (window.TERMBROWSER_URL || process.env.TERMBROWSER_URL || '').trim().replace(/\/+$/, '')
-  if(configured)
-    return configured
-  if(window.location.host?.includes('localhost'))
-    return 'http://localhost:4002'
-  if(/^https:\/\/map\.([a-z]+\.)*openconceptlab\.org$/.test(window.location.origin))
-    return window.location.origin.replace('//map.', '//app.v3.')
-  return 'https://app.v3.openconceptlab.org'
-}
+export const getV3URL = () => resolveV3URL(window.TERMBROWSER_URL || process.env.TERMBROWSER_URL, window.location.origin, window.location.host)
 
 export const toV3URL = path => {
   let referrerParams = `referrer=${window.location.href}`
diff --git a/src/components/app/LeftMenu.jsx b/src/components/app/LeftMenu.jsx
index 5fe32a24..daf5e7aa 100644
--- a/src/components/app/LeftMenu.jsx
+++ b/src/components/app/LeftMenu.jsx
@@ -17,7 +17,9 @@ import { getCurrentUser, refreshCurrentUserCache, getCurrentUserOrgs, toV3URL }
 import Drawer from '../common/Drawer';
 import OrgIcon from '../orgs/OrgIcon';
 import EntityIcon from '../common/EntityIcon'
-import { trayItems } from '../../common/navigation'
+import { trayItems, isTrayItemSelected } from '../../common/navigation'
+import { projectCount } from '../../common/mapProjects'
+import APIService from '../../services/APIService'
 import Button from '@mui/material/Button';
 
 
@@ -43,6 +45,7 @@ const LeftMenu = ({ isOpen, onClose }) => {
 
   const formatFollowing = following => map(following, 'object') || []
 
+  const [mapProjectCount, setMapProjectCount] = React.useState(null)
   const [orgs, setOrgs] = React.useState(getCurrentUserOrgs())
   const [following, setFollowing] = React.useState(formatFollowing(user?.following))
 
@@ -59,6 +62,20 @@ const LeftMenu = ({ isOpen, onClose }) => {
       fetchData()
   }, [isOpen && user?.url])
 
+  React.useEffect(() => {
+    if(!isOpen || !user?.username)
+      return
+    let active = true
+    Promise.all([
+      APIService.users(user.username).appendToUrl('map-projects/').get(null, null, {limit: 1}, true),
+      APIService.users(user.username).appendToUrl('orgs/map-projects/').get(null, null, {limit: 1}, true),
+    ]).then(responses => {
+      if(active)
+        setMapProjectCount(projectCount(...responses))
+    }).catch(() => {})
+    return () => { active = false }
+  }, [isOpen && user?.username])
+
   return (
     <Drawer isOpen={isOpen} onClose={onClose} anchor='left' bgColor='default.main'>
       <DrawerHeader>
@@ -69,7 +86,7 @@ const LeftMenu = ({ isOpen, onClose }) => {
       <List sx={{p: 0}}>
         {
           trayItems(user, true).map(item => {
-            const selected = location.pathname === item.path
+            const selected = isTrayItemSelected(item, location.pathname)
             return (
               <ListItem key={item.key} disablePadding sx={{ display: 'block' }}>
                 <ListItemButton
@@ -98,6 +115,10 @@ const LeftMenu = ({ isOpen, onClose }) => {
                     item.key === 'repos' &&
                       <span><b>{((user?.collections || 0) + (user?.sources + 0)).toLocaleString()}</b></span>
                   }
+                  {
+                    item.key === 'map-projects' && mapProjectCount !== null &&
+                      <span><b>{mapProjectCount.toLocaleString()}</b></span>
+                  }
                 </ListItemButton>
               </ListItem>
             )

From 538a4f668d8311bc83f978b6bdf64d782d197e3c Mon Sep 17 00:00:00 2001
From: Sunny Aggarwal <sny.aggarwal@gmail.com>
Date: Fri, 30 Oct 2026 11:12:38 +0530
Subject: [PATCH 03/14] OpenConceptLab/ocl_online#418 | Hide sibling-app
 navigation unless configured or on a recognized OCL host

---
 src/common/__tests__/appUrls.test.js                | 10 +++++++++-
 src/common/appUrls.js                               |  6 ++++--
 src/common/utils.js                                 |  4 +++-
 src/components/app/Header.jsx                       |  4 ++--
 src/components/app/LeftMenu.jsx                     | 12 +++++++++---
 src/components/common/OCLLogo.jsx                   |  4 ++--
 src/components/map-projects/MapProjectsRedirect.jsx |  4 ++--
 src/components/users/AddMenuList.jsx                |  4 ++--
 8 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/src/common/__tests__/appUrls.test.js b/src/common/__tests__/appUrls.test.js
index e1a42448..7ed6353f 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 { resolveV3URL, PRODUCTION_TERMBROWSER_URL } = await import('../appUrls.js')
+const { resolveV3URL, resolveIntegratedV3URL, PRODUCTION_TERMBROWSER_URL } = await import('../appUrls.js')
 
 test('configured URL wins and loses its trailing slash', () => {
   assert.equal(resolveV3URL('https://tb.example.org/', 'https://map.qa.openconceptlab.org', 'map.qa.openconceptlab.org'), 'https://tb.example.org')
@@ -21,3 +21,11 @@ test('custom hosts without configuration point to production', () => {
   assert.equal(resolveV3URL('', 'https://mapper.example.org', 'mapper.example.org'), PRODUCTION_TERMBROWSER_URL)
   assert.equal(resolveV3URL('', undefined, undefined), PRODUCTION_TERMBROWSER_URL)
 })
+
+test('an integrated TermBrowser needs configuration, localhost or an official Mapper host', () => {
+  assert.equal(resolveIntegratedV3URL('https://tb.example.org/', 'https://mapper.example.org', 'mapper.example.org'), 'https://tb.example.org')
+  assert.equal(resolveIntegratedV3URL('', 'http://localhost:4004', 'localhost:4004'), 'http://localhost:4002')
+  assert.equal(resolveIntegratedV3URL('', 'https://map.qa.openconceptlab.org', 'map.qa.openconceptlab.org'), 'https://app.v3.qa.openconceptlab.org')
+  assert.equal(resolveIntegratedV3URL('', 'https://mapper.example.org', 'mapper.example.org'), '')
+  assert.equal(resolveIntegratedV3URL('', undefined, undefined), '')
+})
diff --git a/src/common/appUrls.js b/src/common/appUrls.js
index 4ffedd67..d3add84f 100644
--- a/src/common/appUrls.js
+++ b/src/common/appUrls.js
@@ -2,7 +2,7 @@ export const PRODUCTION_TERMBROWSER_URL = 'https://app.v3.openconceptlab.org'
 
 const OFFICIAL_MAPPER_ORIGIN = /^https:\/\/map\.([a-z]+\.)*openconceptlab\.org$/
 
-export const resolveV3URL = (configured, origin, host) => {
+export const resolveIntegratedV3URL = (configured, origin, host) => {
   const url = (configured || '').trim().replace(/\/+$/, '')
   if(url)
     return url
@@ -10,5 +10,7 @@ export const resolveV3URL = (configured, origin, host) => {
     return 'http://localhost:4002'
   if(OFFICIAL_MAPPER_ORIGIN.test(origin || ''))
     return origin.replace('//map.', '//app.v3.')
-  return PRODUCTION_TERMBROWSER_URL
+  return ''
 }
+
+export const resolveV3URL = (configured, origin, host) => resolveIntegratedV3URL(configured, origin, host) || PRODUCTION_TERMBROWSER_URL
diff --git a/src/common/utils.js b/src/common/utils.js
index e63d6781..db615898 100644
--- a/src/common/utils.js
+++ b/src/common/utils.js
@@ -18,7 +18,7 @@ import GAService from '../services/GAService';
 import { ensureIdToken, prepareSignOut, settleForcedSignOut, renewSessionSilently } from './ssoSession';
 import { SERVER_CONFIGS } from './serverConfigs';
 import { legacyHashRoute, isSameSitePath } from './history';
-import { resolveV3URL } from './appUrls';
+import { resolveV3URL, resolveIntegratedV3URL } from './appUrls';
 
 export const currentPath = () => window.location.pathname;
 
@@ -1096,6 +1096,8 @@ export const pluralize = (count, singular, plural) => `${count?.toLocaleString()
 
 export const getV3URL = () => resolveV3URL(window.TERMBROWSER_URL || process.env.TERMBROWSER_URL, window.location.origin, window.location.host)
 
+export const hasTermBrowser = () => Boolean(resolveIntegratedV3URL(window.TERMBROWSER_URL || process.env.TERMBROWSER_URL, window.location.origin, window.location.host))
+
 export const toV3URL = path => {
   let referrerParams = `referrer=${window.location.href}`
   if(isLoggedIn())
diff --git a/src/components/app/Header.jsx b/src/components/app/Header.jsx
index ae761c86..e6bcd030 100644
--- a/src/components/app/Header.jsx
+++ b/src/components/app/Header.jsx
@@ -8,7 +8,7 @@ import CssBaseline from '@mui/material/CssBaseline';
 import MenuIcon from '@mui/icons-material/Menu';
 import { COLORS } from '../../common/colors';
 import OCLLogo from '../common/OCLLogo';
-import { getCurrentUser } from '../../common/utils';
+import { getCurrentUser, hasTermBrowser } from '../../common/utils';
 import './Header.scss';
 import HeaderControls from './HeaderControls';
 import LeftMenu from './LeftMenu'
@@ -67,7 +67,7 @@ const Header = props => {
             </div>
             <div className='col-xs-3' />
             <div className='col-xs-4 padding-0' style={{textAlign: 'center'}}>
-              {Boolean(user?.url) && <HeaderSearch />}
+              {Boolean(user?.url) && hasTermBrowser() && <HeaderSearch />}
             </div>
             <HeaderControls />
           </div>
diff --git a/src/components/app/LeftMenu.jsx b/src/components/app/LeftMenu.jsx
index daf5e7aa..dd57f45e 100644
--- a/src/components/app/LeftMenu.jsx
+++ b/src/components/app/LeftMenu.jsx
@@ -13,7 +13,7 @@ import FolderOpenIcon from '@mui/icons-material/FolderOutlined';
 import Divider from '@mui/material/Divider';
 import map from 'lodash/map'
 import { PRIMARY_COLORS } from '../../common/colors'
-import { getCurrentUser, refreshCurrentUserCache, getCurrentUserOrgs, toV3URL } from '../../common/utils';
+import { getCurrentUser, refreshCurrentUserCache, getCurrentUserOrgs, hasTermBrowser, toV3URL } from '../../common/utils';
 import Drawer from '../common/Drawer';
 import OrgIcon from '../orgs/OrgIcon';
 import EntityIcon from '../common/EntityIcon'
@@ -42,6 +42,7 @@ const LeftMenu = ({ isOpen, onClose }) => {
   const { t } = useTranslation()
   const location = useLocation()
   const user = getCurrentUser()
+  const integrated = hasTermBrowser()
 
   const formatFollowing = following => map(following, 'object') || []
 
@@ -85,13 +86,14 @@ const LeftMenu = ({ isOpen, onClose }) => {
       </DrawerHeader>
       <List sx={{p: 0}}>
         {
-          trayItems(user, true).map(item => {
+          trayItems(user, true).filter(item => integrated || item.key === 'map-projects').map(tray => {
+            const item = integrated ? tray : {...tray, path: '/map-projects'}
             const selected = isTrayItemSelected(item, location.pathname)
             return (
               <ListItem key={item.key} disablePadding sx={{ display: 'block' }}>
                 <ListItemButton
                   onClick={onClose}
-                  href={toV3URL(item.path)}
+                  href={integrated ? toV3URL(item.path) : `#${item.path}`}
                   className='no-anchor-styles'
                   selected={selected}
                   sx={{
@@ -125,6 +127,8 @@ const LeftMenu = ({ isOpen, onClose }) => {
           })
         }
       </List>
+      {integrated && (
+        <>
       <Divider style={{width: '100%', marginTop: '16px'}} />
       <List sx={{maxHeight: '300px', overflow: 'auto', p: 0}} dense>
         <ListItem
@@ -224,6 +228,8 @@ const LeftMenu = ({ isOpen, onClose }) => {
           ))
         }
       </List>
+        </>
+      )}
     </Drawer>
   )
 }
diff --git a/src/components/common/OCLLogo.jsx b/src/components/common/OCLLogo.jsx
index 4260f9cd..8935e339 100644
--- a/src/components/common/OCLLogo.jsx
+++ b/src/components/common/OCLLogo.jsx
@@ -1,11 +1,11 @@
 import React from 'react';
 import SvgIcon from '@mui/material/SvgIcon';
 import { PRIMARY_COLORS } from '../../common/colors'
-import { toV3URL } from '../../common/utils'
+import { hasTermBrowser, toV3URL } from '../../common/utils'
 
 const OCLLogo = ({ color, width, height, }) => {
   return (
-    <a className='hover-no-bg-color flex-vertical-center' href={toV3URL()}>
+    <a className='hover-no-bg-color flex-vertical-center' href={hasTermBrowser() ? toV3URL() : '#/'}>
       <SvgIcon sx={{color: 'primary.main', fill: color || PRIMARY_COLORS.main, width: width || '84px', height: height || '28px'}}>
         <svg version="1.1" id="Layer_1" x="0px" y="0px" viewBox="0 0 306.14 111.63">
           <g>
diff --git a/src/components/map-projects/MapProjectsRedirect.jsx b/src/components/map-projects/MapProjectsRedirect.jsx
index 700bb82c..13d700bc 100644
--- a/src/components/map-projects/MapProjectsRedirect.jsx
+++ b/src/components/map-projects/MapProjectsRedirect.jsx
@@ -1,11 +1,11 @@
 import React from 'react';
-import { getCurrentUser, toV3URL } from '../../common/utils';
+import { getCurrentUser, hasTermBrowser, toV3URL } from '../../common/utils';
 import MapProjects from './MapProjects';
 
 const MapProjectsRedirect = props => {
   const user = getCurrentUser()
   const blockedNewProject = Boolean(props.location?.state?.newProjectBlock)
-  const redirect = Boolean(user?.url) && !blockedNewProject
+  const redirect = Boolean(user?.url) && !blockedNewProject && hasTermBrowser()
 
   React.useEffect(() => {
     if(redirect)
diff --git a/src/components/users/AddMenuList.jsx b/src/components/users/AddMenuList.jsx
index 8d0ee2ac..62759ee5 100644
--- a/src/components/users/AddMenuList.jsx
+++ b/src/components/users/AddMenuList.jsx
@@ -2,7 +2,7 @@ import React from 'react';
 import { useTranslation } from 'react-i18next'
 import { Menu, ListItemButton, ListItemText, ListItemIcon, Divider} from '@mui/material'
 import ImportIcon from '@mui/icons-material/Publish';
-import { getCurrentUser, toV3URL } from '../../common/utils';
+import { getCurrentUser, hasTermBrowser, toV3URL } from '../../common/utils';
 import { createItems } from '../../common/navigation';
 import OrgIcon from '../orgs/OrgIcon'
 import RepoIcon from '../repos/RepoIcon'
@@ -30,7 +30,7 @@ const AddMenuList = ({ anchorEl, open, onClose }) => {
       sx={{'.MuiPaper-root': {backgroundColor: 'surface.n94', minWidth: '200px'}}}
     >
       {
-        createItems(user, true).flatMap(item => [
+        createItems(user, true).filter(item => hasTermBrowser() || item.app !== 'v3').flatMap(item => [
           item.divider && <Divider key={`${item.key}-divider`} />,
           <ListItemButton key={item.key} id={CREATE_ITEM_IDS[item.key]} href={item.app === 'v3' ? toV3URL(item.path) : item.path} sx={ITEM_SX} onClick={onClose}>
             <ListItemIcon sx={{minWidth: 'auto', marginRight: '12px'}}>

From db31c5fede873d45bc24125c95a13930b8ea9c27 Mon Sep 17 00:00:00 2001
From: Sunny Aggarwal <sny.aggarwal@gmail.com>
Date: Fri, 30 Oct 2026 11:28:01 +0530
Subject: [PATCH 04/14] OpenConceptLab/ocl_online#418 | Keep project breadcrumb
 local without a configured TermBrowser

---
 package-lock.json                             | 142 +++++++++---------
 src/common/__tests__/breadcrumb.test.js       |  20 +++
 src/common/breadcrumb.js                      |   4 +
 .../map-projects/MapProjectBreadcrumb.jsx     |   9 +-
 4 files changed, 102 insertions(+), 73 deletions(-)
 create mode 100644 src/common/__tests__/breadcrumb.test.js
 create mode 100644 src/common/breadcrumb.js

diff --git a/package-lock.json b/package-lock.json
index 9b8b2f2c..cd4515cd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "ocl-map",
-  "version": "1.0.37-beta",
+  "version": "1.0.43-beta",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "ocl-map",
-      "version": "1.0.37-beta",
+      "version": "1.0.43-beta",
       "dependencies": {
         "@airbrake/browser": "^2.1.9",
         "@emotion/react": "^11.14.0",
@@ -159,13 +159,13 @@
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.29.8",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.29.8.tgz",
-      "integrity": "sha512-gZbepsdh3WDtgZKWL+vTPh71LSBrm/Y4/QDZBVCcYfmeTEEuoOYwlSy+G1StfJg+/Zy550u/3TATbm7qDbbMtg==",
+      "version": "7.29.12",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.29.12.tgz",
+      "integrity": "sha512-2W76mhjrpQFO1lK5e8IvGYB2D0YZ7S2R1Z2BjO2ZUYuW+amcpK/z60U6ZZmzskwoa7sJ6XohP/Wg8H5KxXI/IA==",
       "license": "MIT",
       "dependencies": {
-        "@babel/parser": "^7.29.8",
-        "@babel/types": "^7.29.8",
+        "@babel/parser": "^7.29.12",
+        "@babel/types": "^7.29.11",
         "@jridgewell/gen-mapping": "^0.3.12",
         "@jridgewell/trace-mapping": "^0.3.28",
         "jsesc": "^3.0.2"
@@ -205,9 +205,9 @@
       }
     },
     "node_modules/@babel/helper-create-class-features-plugin": {
-      "version": "7.29.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.29.7.tgz",
-      "integrity": "sha512-IY3ZD9Tmooqr3TUhc3DUWxiuo8xx1DWLhd5M7hQ+ZWJamqM2BbalrBJb2MisSLoYorOj75U03qULCxQTY9r3hg==",
+      "version": "7.29.12",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.29.12.tgz",
+      "integrity": "sha512-ACxGoWMV866q/QlZHeCOaQZAR5QclKsIvkAmlDemqjm6+6Bynijs1mH068BzH2N2e+wSuDmBWY87fqKfvhi1Lw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -216,7 +216,7 @@
         "@babel/helper-optimise-call-expression": "^7.29.7",
         "@babel/helper-replace-supers": "^7.29.7",
         "@babel/helper-skip-transparent-expression-wrappers": "^7.29.7",
-        "@babel/traverse": "^7.29.7",
+        "@babel/traverse": "^7.29.12",
         "semver": "^6.3.1"
       },
       "engines": {
@@ -446,9 +446,9 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.29.11",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.11.tgz",
-      "integrity": "sha512-OZ6+oaK7GMyg3IfCpj8JOmn8n+w2rJbDT0LLfVDTLb1ZFeKDh3AiNELgCMUw175IJHSkLl74hG0M0VLsvx+gag==",
+      "version": "7.29.12",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.12.tgz",
+      "integrity": "sha512-WJ7JBp/Q4+z/ImydtI7jS6NVco5++632ExBemSX+Ysb+G1lCwQ5BVo3SY+jGGOcZXI4ZccbZSUSJLNBW6eEpJg==",
       "license": "MIT",
       "dependencies": {
         "@babel/types": "^7.29.11"
@@ -760,9 +760,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-block-scoping": {
-      "version": "7.29.11",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.29.11.tgz",
-      "integrity": "sha512-iARF4jjHSM0v8DImCACPXrwEltBP3DgqDpXTvjAMBAVpyEY0LiGss78wvI+KtmW+IJNEvZ5sOhPDCsOsXsIybA==",
+      "version": "7.29.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.29.12.tgz",
+      "integrity": "sha512-nEreZBofjfd6FG621xe9Rk3+tMGBXf1nAuFrR6NUGF67fkQbSQf3NrbRuhgWRn+zb0qcy9XVok1GVFI/t9wWVQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1783,17 +1783,17 @@
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.29.10",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.29.10.tgz",
-      "integrity": "sha512-B3lYAs2nkKskbgQ1nfy8Ma9ao9Q1rntTAQHrzzyDuj+TSO+X3le6PfWwqDvodsb+OumE10eMFfuMCTQSQ5iuIQ==",
+      "version": "7.29.12",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.29.12.tgz",
+      "integrity": "sha512-MscXe/NAZcOkYEsRajHZFt3ynsb22PUi6CTrp5U7+RYycR9By84mn9mFN54YgfITiqK4hFx3Ju3tZSyzfpS5ew==",
       "license": "MIT",
       "dependencies": {
         "@babel/code-frame": "^7.29.7",
-        "@babel/generator": "^7.29.8",
+        "@babel/generator": "^7.29.12",
         "@babel/helper-globals": "^7.29.7",
-        "@babel/parser": "^7.29.9",
+        "@babel/parser": "^7.29.12",
         "@babel/template": "^7.29.7",
-        "@babel/types": "^7.29.8",
+        "@babel/types": "^7.29.11",
         "debug": "^4.3.1"
       },
       "engines": {
@@ -3680,9 +3680,9 @@
       }
     },
     "node_modules/@types/estree": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.9.tgz",
-      "integrity": "sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg==",
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.10.tgz",
+      "integrity": "sha512-lTyOMnOcmRBzdCv6/4zUZCrEhV0xrqQiUZBZtVcbmLHBXKLnN8q89v/wKRF/Q0HbwVsqbIG3o5HDoFl9sduM+g==",
       "license": "MIT"
     },
     "node_modules/@types/estree-jsx": {
@@ -3790,9 +3790,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "26.6.5",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-26.6.5.tgz",
-      "integrity": "sha512-uMzsv9stDdofIZBx4UGh4Z9ZgXnGC9seRDscilBcTHAeOFk67MZg/k9bWVfO+bk4qZmG+l52hRnLwUiH2LnJTg==",
+      "version": "26.6.6",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-26.6.6.tgz",
+      "integrity": "sha512-MzQj+8Kx3XI40OmUAE6Qoh58ZMNstNNMwn2nfd3qWsfe7nDNSqJNzes4njhz6AHwrSHOffSLwXU6yb474Q4aog==",
       "license": "MIT",
       "dependencies": {
         "undici-types": "~8.9.0"
@@ -4684,9 +4684,9 @@
       }
     },
     "node_modules/axios": {
-      "version": "1.20.0",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.20.0.tgz",
-      "integrity": "sha512-r8aOh8j9cGKpgQAqpzrUHnSIc6a59Y3Xf/cv8sy1DrHCkZHzQGEuoq1tARk6qSyDdtQGSDgpb9kFlruzPvrgwg==",
+      "version": "1.21.0",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.21.0.tgz",
+      "integrity": "sha512-YCzXMB53Q9PZBsh7yN7wtapit4WepwcHS2fP8QhGsBxSz5YtgYobV7GGlWlAJi+RxfU77GQTQi2DSLUma42EYA==",
       "license": "MIT",
       "dependencies": {
         "follow-redirects": "^1.16.0",
@@ -4867,9 +4867,9 @@
       "license": "MIT"
     },
     "node_modules/baseline-browser-mapping": {
-      "version": "2.11.33",
-      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.11.33.tgz",
-      "integrity": "sha512-yiVKDX+qCMRKBE084lXvq9EcwFUhKZ2nU8TK1EQQuOgPNR/lmbGxXOeDdlGUqC2Zz11Cs9rk1d/8NfgBmlkt0w==",
+      "version": "2.11.34",
+      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.11.34.tgz",
+      "integrity": "sha512-Aqr8mA1kIvyJ3UY5YAY7ib8LSo1DmDMbMnVqGPtsKW1LxaFQFwn9Eb3yvq2fUKJsRvaXjnAV7R5osqETapzNiA==",
       "dev": true,
       "license": "Apache-2.0",
       "bin": {
@@ -5007,9 +5007,9 @@
       }
     },
     "node_modules/browserslist": {
-      "version": "4.29.4",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.29.4.tgz",
-      "integrity": "sha512-2TcbbiwXEq+N0kD36tykpCfyyQigUXmuwNQbnPp4Xk4PX9JOqVIKjJlIDjpH7uY6tmRGoAd+apeT1p60T8wsdA==",
+      "version": "4.29.5",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.29.5.tgz",
+      "integrity": "sha512-khTmKu5NGYTotqcYo8Bew2k4RAE9PuXRSFRXG2lQBrCEQHyeQ/vX6gKMxfokwywBsLiXZMnHsmWMG1pnO8J7uQ==",
       "dev": true,
       "funding": [
         {
@@ -5027,10 +5027,10 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "baseline-browser-mapping": "^2.11.29",
-        "caniuse-lite": "^1.0.30001816",
-        "electron-to-chromium": "^1.5.459",
-        "node-releases": "^2.0.59",
+        "baseline-browser-mapping": "^2.11.33",
+        "caniuse-lite": "^1.0.30001819",
+        "electron-to-chromium": "^1.5.464",
+        "node-releases": "^2.0.60",
         "update-browserslist-db": "^1.3.4"
       },
       "bin": {
@@ -5221,16 +5221,16 @@
       }
     },
     "node_modules/caniuse-db": {
-      "version": "1.0.30001819",
-      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30001819.tgz",
-      "integrity": "sha512-mLpSoyGOxULIZqnuoPKJl/Z8CCpgmaRotGeoGCJawSf649JqQ75QzR+bqM2tUSlwCnCGPRiNguITesfTJbQvUg==",
+      "version": "1.0.30001820",
+      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30001820.tgz",
+      "integrity": "sha512-zQcHHXW1JBaCQIrIB9GSljW1WpxaFOntxRIJB+AiRKrVIKRoxocsOJ1ofzekZrr3uCH9OJXjvxAOgdH0qtGzSQ==",
       "dev": true,
       "license": "CC-BY-4.0"
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001819",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001819.tgz",
-      "integrity": "sha512-LFUqIIAwpzsIuevnKnsR9qnStBcgzPShTX61lBwN9uFkkf8o8zLiebEjbW8AYtZiF+1YKDWfdt/pWDtMuG8Xwg==",
+      "version": "1.0.30001820",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001820.tgz",
+      "integrity": "sha512-gfWD6MxqVCqAOwmODfZf7DchWvlrA+SRdNX7ceLfg3xRqe5ssjjpF7EgslC/0tiLiNTajdaNN/q8c/5u/7Gz8w==",
       "dev": true,
       "funding": [
         {
@@ -6616,9 +6616,9 @@
       "license": "MIT"
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.5.464",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.464.tgz",
-      "integrity": "sha512-nRa65aFge40viPAKxMKULIY8tcXKwKboJWNn4RoKwyWXJ6SP7BnrDGKUTzc64818jIciH0PK7LSF8QzZes19GA==",
+      "version": "1.5.468",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.468.tgz",
+      "integrity": "sha512-8XdEp3sIqO+PzmVPxhzqHq/3+yCxp44m27cm2WY1sRn3ZhwKyKmqSi2hx6gEhmnOXmh8NUuYE00z6Onzn5m6DA==",
       "dev": true,
       "license": "ISC"
     },
@@ -6640,13 +6640,17 @@
       }
     },
     "node_modules/encodeurl": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
-      "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.1.tgz",
+      "integrity": "sha512-Ev/hIyePLZtpL98x562lvPtenrUfGr0lfaf44HFZ+hDEwso7ccV9QAZrEVLg0hxNAzygaAFxy2dYaAKKM0G06A==",
       "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 0.8"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/express"
       }
     },
     "node_modules/end-of-stream": {
@@ -10191,9 +10195,9 @@
       }
     },
     "node_modules/mdast-util-to-markdown": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/mdast-util-to-markdown/-/mdast-util-to-markdown-2.2.0.tgz",
-      "integrity": "sha512-2Jn/ADrHFFyyniBMi0bncTbJqU78K3/TEYvzvwrWWzD9MYPUa/Gm4r3nOeKFQg/PDM5BsbDYdc8ackW4NTY6NA==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/mdast-util-to-markdown/-/mdast-util-to-markdown-2.2.1.tgz",
+      "integrity": "sha512-ThatlCBxG2GE+mljhNSfZPv56d3QrGiRh97jjYgIk80IzS4uU6d7cHAaexCYSAmUCCcOs3grJ07kX3oTGsFUOw==",
       "license": "MIT",
       "dependencies": {
         "@types/mdast": "^4.0.0",
@@ -11189,9 +11193,9 @@
       }
     },
     "node_modules/node-releases": {
-      "version": "2.0.60",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.60.tgz",
-      "integrity": "sha512-OmO8+GM1JUZqXET720VrJCwkjUCXmCMQm0Z3UDDRbfNLHS4NEAvY60j5jiFv0tkKw2PNNlqOLhahVmwJIOLDIQ==",
+      "version": "2.0.61",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.61.tgz",
+      "integrity": "sha512-5NUN6QCxNFrS9oEA9RPS+d0AP+ooGBzzovY2JhIpDRHacPvOhHjXjUsUMX9qp4nLHZ+5jVgXB2jj/P4arGOE/g==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -11248,9 +11252,9 @@
       }
     },
     "node_modules/num2fraction": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz",
-      "integrity": "sha512-Y1wZESM7VUThYY+4W+X4ySH2maqcA+p7UR+w8VWNWVAd6lwuXXWz/w/Cz43J/dI2I+PS6wD5N+bJUF+gjWvIqg==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.3.0.tgz",
+      "integrity": "sha512-rclir6MW4M4Hinz/AnripNvEbz8HRxJ9Qkrtj0V8ivgEsfpxGWGbXDkfCT4IJLEWegu4pvO9qibWpeHkODkGqg==",
       "dev": true,
       "license": "MIT"
     },
@@ -12843,9 +12847,9 @@
       }
     },
     "node_modules/qs": {
-      "version": "6.16.1",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.16.1.tgz",
-      "integrity": "sha512-5Px6J7rfHBAGUhNQ3es4YzcOdBBw0SDcVtThJml4RdnKw4tKs2epA0kPZ+K8X+WiHktT93RHVcQ/3ym5aTCgtg==",
+      "version": "6.16.2",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.16.2.tgz",
+      "integrity": "sha512-VYdnB5S7/0IeXzBacUtwNAaM6d7Y/PgYnNC7bJCI6meqA/OgnsQbZMtVW8Dt2D1PHgbHGtYmhSoEIgvt7xZ2ZA==",
       "dev": true,
       "license": "BSD-3-Clause",
       "dependencies": {
@@ -13636,9 +13640,9 @@
       "license": "MIT"
     },
     "node_modules/sass": {
-      "version": "1.106.1",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.106.1.tgz",
-      "integrity": "sha512-kD+Gi66vycZcbJt+42NC4z4PXNMcCajVrJPhqoKKXy5cOBMmJQt052CxIBcRjwYXeImHYOpu/ydWWGZQIenl7A==",
+      "version": "1.107.0",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.107.0.tgz",
+      "integrity": "sha512-+whPilvVNoAD57xvdIPLQT0gXo4RD1lHYw+Uw8zYHlojaeaMDxK14tc0JmEsz/XMns48h3lpypisMP+3E8eHQA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
diff --git a/src/common/__tests__/breadcrumb.test.js b/src/common/__tests__/breadcrumb.test.js
new file mode 100644
index 00000000..714f9b89
--- /dev/null
+++ b/src/common/__tests__/breadcrumb.test.js
@@ -0,0 +1,20 @@
+import test from 'node:test'
+import assert from 'node:assert/strict'
+
+const { projectCrumbs } = await import('../breadcrumb.js')
+
+const toV3URL = path => `https://tb.example.org/#${path}`
+
+test('integrated deployments link both crumbs to TermBrowser', () => {
+  assert.deepEqual(projectCrumbs('/users/test/', true, toV3URL).map(c => c.href), [
+    'https://tb.example.org/#/users/test/',
+    'https://tb.example.org/#/users/test/map-projects'
+  ])
+})
+
+test('standalone deployments keep the owner as text and the projects crumb local', () => {
+  assert.deepEqual(projectCrumbs('/users/test/', false, () => { throw new Error('no TermBrowser link') }).map(c => c.href), [
+    null,
+    '#/map-projects'
+  ])
+})
diff --git a/src/common/breadcrumb.js b/src/common/breadcrumb.js
new file mode 100644
index 00000000..cd03ffb7
--- /dev/null
+++ b/src/common/breadcrumb.js
@@ -0,0 +1,4 @@
+export const projectCrumbs = (ownerURL, integrated, toV3URL) => [
+  {key: 'owner', href: integrated ? toV3URL(ownerURL) : null},
+  {key: 'projects', href: integrated ? toV3URL(`${ownerURL}map-projects`) : '#/map-projects'}
+]
diff --git a/src/components/map-projects/MapProjectBreadcrumb.jsx b/src/components/map-projects/MapProjectBreadcrumb.jsx
index eefbd6b4..532928a5 100644
--- a/src/components/map-projects/MapProjectBreadcrumb.jsx
+++ b/src/components/map-projects/MapProjectBreadcrumb.jsx
@@ -2,18 +2,19 @@ import React from 'react';
 import { useTranslation } from 'react-i18next';
 import Link from '@mui/material/Link';
 import ChevronRightIcon from '@mui/icons-material/ChevronRight';
-import { toV3URL } from '../../common/utils';
+import { hasTermBrowser, toV3URL } from '../../common/utils';
+import { projectCrumbs } from '../../common/breadcrumb';
 
 const MapProjectBreadcrumb = ({ ownerType, owner }) => {
   const { t } = useTranslation()
   if(!ownerType || !owner)
     return null
-  const ownerURL = `/${ownerType}/${owner}/`
+  const [ownerCrumb, projectsCrumb] = projectCrumbs(`/${ownerType}/${owner}/`, hasTermBrowser(), toV3URL)
   return (
     <span aria-label='breadcrumb' style={{display: 'flex', alignItems: 'center', fontSize: '14px', marginRight: '12px', whiteSpace: 'nowrap'}}>
-      <Link href={toV3URL(ownerURL)} underline='hover' color='inherit'>{owner}</Link>
+      {ownerCrumb.href ? <Link href={ownerCrumb.href} underline='hover' color='inherit'>{owner}</Link> : <span>{owner}</span>}
       <ChevronRightIcon fontSize='inherit' sx={{margin: '0 4px'}} />
-      <Link href={toV3URL(`${ownerURL}map-projects`)} underline='hover' color='inherit'>{t('map_project.mapping_projects')}</Link>
+      <Link href={projectsCrumb.href} underline='hover' color='inherit'>{t('map_project.mapping_projects')}</Link>
     </span>
   )
 }

From fe0965b5f1997aae83ddf98ddedc0d08cec4e40e Mon Sep 17 00:00:00 2001
From: Jonathan Payne <paynejd@gmail.com>
Date: Fri, 30 Oct 2026 10:54:12 -0400
Subject: [PATCH 05/14] OpenConceptLab/ocl_online#418 | Drop unrelated
 lock-file changes; Chinese Bulk Import label

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 package-lock.json                     | 142 +++++++++++++-------------
 src/i18n/locales/zh/translations.json |   3 +
 2 files changed, 72 insertions(+), 73 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index cd4515cd..9b8b2f2c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "ocl-map",
-  "version": "1.0.43-beta",
+  "version": "1.0.37-beta",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "ocl-map",
-      "version": "1.0.43-beta",
+      "version": "1.0.37-beta",
       "dependencies": {
         "@airbrake/browser": "^2.1.9",
         "@emotion/react": "^11.14.0",
@@ -159,13 +159,13 @@
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.29.12",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.29.12.tgz",
-      "integrity": "sha512-2W76mhjrpQFO1lK5e8IvGYB2D0YZ7S2R1Z2BjO2ZUYuW+amcpK/z60U6ZZmzskwoa7sJ6XohP/Wg8H5KxXI/IA==",
+      "version": "7.29.8",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.29.8.tgz",
+      "integrity": "sha512-gZbepsdh3WDtgZKWL+vTPh71LSBrm/Y4/QDZBVCcYfmeTEEuoOYwlSy+G1StfJg+/Zy550u/3TATbm7qDbbMtg==",
       "license": "MIT",
       "dependencies": {
-        "@babel/parser": "^7.29.12",
-        "@babel/types": "^7.29.11",
+        "@babel/parser": "^7.29.8",
+        "@babel/types": "^7.29.8",
         "@jridgewell/gen-mapping": "^0.3.12",
         "@jridgewell/trace-mapping": "^0.3.28",
         "jsesc": "^3.0.2"
@@ -205,9 +205,9 @@
       }
     },
     "node_modules/@babel/helper-create-class-features-plugin": {
-      "version": "7.29.12",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.29.12.tgz",
-      "integrity": "sha512-ACxGoWMV866q/QlZHeCOaQZAR5QclKsIvkAmlDemqjm6+6Bynijs1mH068BzH2N2e+wSuDmBWY87fqKfvhi1Lw==",
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.29.7.tgz",
+      "integrity": "sha512-IY3ZD9Tmooqr3TUhc3DUWxiuo8xx1DWLhd5M7hQ+ZWJamqM2BbalrBJb2MisSLoYorOj75U03qULCxQTY9r3hg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -216,7 +216,7 @@
         "@babel/helper-optimise-call-expression": "^7.29.7",
         "@babel/helper-replace-supers": "^7.29.7",
         "@babel/helper-skip-transparent-expression-wrappers": "^7.29.7",
-        "@babel/traverse": "^7.29.12",
+        "@babel/traverse": "^7.29.7",
         "semver": "^6.3.1"
       },
       "engines": {
@@ -446,9 +446,9 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.29.12",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.12.tgz",
-      "integrity": "sha512-WJ7JBp/Q4+z/ImydtI7jS6NVco5++632ExBemSX+Ysb+G1lCwQ5BVo3SY+jGGOcZXI4ZccbZSUSJLNBW6eEpJg==",
+      "version": "7.29.11",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.11.tgz",
+      "integrity": "sha512-OZ6+oaK7GMyg3IfCpj8JOmn8n+w2rJbDT0LLfVDTLb1ZFeKDh3AiNELgCMUw175IJHSkLl74hG0M0VLsvx+gag==",
       "license": "MIT",
       "dependencies": {
         "@babel/types": "^7.29.11"
@@ -760,9 +760,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-block-scoping": {
-      "version": "7.29.12",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.29.12.tgz",
-      "integrity": "sha512-nEreZBofjfd6FG621xe9Rk3+tMGBXf1nAuFrR6NUGF67fkQbSQf3NrbRuhgWRn+zb0qcy9XVok1GVFI/t9wWVQ==",
+      "version": "7.29.11",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.29.11.tgz",
+      "integrity": "sha512-iARF4jjHSM0v8DImCACPXrwEltBP3DgqDpXTvjAMBAVpyEY0LiGss78wvI+KtmW+IJNEvZ5sOhPDCsOsXsIybA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1783,17 +1783,17 @@
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.29.12",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.29.12.tgz",
-      "integrity": "sha512-MscXe/NAZcOkYEsRajHZFt3ynsb22PUi6CTrp5U7+RYycR9By84mn9mFN54YgfITiqK4hFx3Ju3tZSyzfpS5ew==",
+      "version": "7.29.10",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.29.10.tgz",
+      "integrity": "sha512-B3lYAs2nkKskbgQ1nfy8Ma9ao9Q1rntTAQHrzzyDuj+TSO+X3le6PfWwqDvodsb+OumE10eMFfuMCTQSQ5iuIQ==",
       "license": "MIT",
       "dependencies": {
         "@babel/code-frame": "^7.29.7",
-        "@babel/generator": "^7.29.12",
+        "@babel/generator": "^7.29.8",
         "@babel/helper-globals": "^7.29.7",
-        "@babel/parser": "^7.29.12",
+        "@babel/parser": "^7.29.9",
         "@babel/template": "^7.29.7",
-        "@babel/types": "^7.29.11",
+        "@babel/types": "^7.29.8",
         "debug": "^4.3.1"
       },
       "engines": {
@@ -3680,9 +3680,9 @@
       }
     },
     "node_modules/@types/estree": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.10.tgz",
-      "integrity": "sha512-lTyOMnOcmRBzdCv6/4zUZCrEhV0xrqQiUZBZtVcbmLHBXKLnN8q89v/wKRF/Q0HbwVsqbIG3o5HDoFl9sduM+g==",
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.9.tgz",
+      "integrity": "sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg==",
       "license": "MIT"
     },
     "node_modules/@types/estree-jsx": {
@@ -3790,9 +3790,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "26.6.6",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-26.6.6.tgz",
-      "integrity": "sha512-MzQj+8Kx3XI40OmUAE6Qoh58ZMNstNNMwn2nfd3qWsfe7nDNSqJNzes4njhz6AHwrSHOffSLwXU6yb474Q4aog==",
+      "version": "26.6.5",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-26.6.5.tgz",
+      "integrity": "sha512-uMzsv9stDdofIZBx4UGh4Z9ZgXnGC9seRDscilBcTHAeOFk67MZg/k9bWVfO+bk4qZmG+l52hRnLwUiH2LnJTg==",
       "license": "MIT",
       "dependencies": {
         "undici-types": "~8.9.0"
@@ -4684,9 +4684,9 @@
       }
     },
     "node_modules/axios": {
-      "version": "1.21.0",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.21.0.tgz",
-      "integrity": "sha512-YCzXMB53Q9PZBsh7yN7wtapit4WepwcHS2fP8QhGsBxSz5YtgYobV7GGlWlAJi+RxfU77GQTQi2DSLUma42EYA==",
+      "version": "1.20.0",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.20.0.tgz",
+      "integrity": "sha512-r8aOh8j9cGKpgQAqpzrUHnSIc6a59Y3Xf/cv8sy1DrHCkZHzQGEuoq1tARk6qSyDdtQGSDgpb9kFlruzPvrgwg==",
       "license": "MIT",
       "dependencies": {
         "follow-redirects": "^1.16.0",
@@ -4867,9 +4867,9 @@
       "license": "MIT"
     },
     "node_modules/baseline-browser-mapping": {
-      "version": "2.11.34",
-      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.11.34.tgz",
-      "integrity": "sha512-Aqr8mA1kIvyJ3UY5YAY7ib8LSo1DmDMbMnVqGPtsKW1LxaFQFwn9Eb3yvq2fUKJsRvaXjnAV7R5osqETapzNiA==",
+      "version": "2.11.33",
+      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.11.33.tgz",
+      "integrity": "sha512-yiVKDX+qCMRKBE084lXvq9EcwFUhKZ2nU8TK1EQQuOgPNR/lmbGxXOeDdlGUqC2Zz11Cs9rk1d/8NfgBmlkt0w==",
       "dev": true,
       "license": "Apache-2.0",
       "bin": {
@@ -5007,9 +5007,9 @@
       }
     },
     "node_modules/browserslist": {
-      "version": "4.29.5",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.29.5.tgz",
-      "integrity": "sha512-khTmKu5NGYTotqcYo8Bew2k4RAE9PuXRSFRXG2lQBrCEQHyeQ/vX6gKMxfokwywBsLiXZMnHsmWMG1pnO8J7uQ==",
+      "version": "4.29.4",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.29.4.tgz",
+      "integrity": "sha512-2TcbbiwXEq+N0kD36tykpCfyyQigUXmuwNQbnPp4Xk4PX9JOqVIKjJlIDjpH7uY6tmRGoAd+apeT1p60T8wsdA==",
       "dev": true,
       "funding": [
         {
@@ -5027,10 +5027,10 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "baseline-browser-mapping": "^2.11.33",
-        "caniuse-lite": "^1.0.30001819",
-        "electron-to-chromium": "^1.5.464",
-        "node-releases": "^2.0.60",
+        "baseline-browser-mapping": "^2.11.29",
+        "caniuse-lite": "^1.0.30001816",
+        "electron-to-chromium": "^1.5.459",
+        "node-releases": "^2.0.59",
         "update-browserslist-db": "^1.3.4"
       },
       "bin": {
@@ -5221,16 +5221,16 @@
       }
     },
     "node_modules/caniuse-db": {
-      "version": "1.0.30001820",
-      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30001820.tgz",
-      "integrity": "sha512-zQcHHXW1JBaCQIrIB9GSljW1WpxaFOntxRIJB+AiRKrVIKRoxocsOJ1ofzekZrr3uCH9OJXjvxAOgdH0qtGzSQ==",
+      "version": "1.0.30001819",
+      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30001819.tgz",
+      "integrity": "sha512-mLpSoyGOxULIZqnuoPKJl/Z8CCpgmaRotGeoGCJawSf649JqQ75QzR+bqM2tUSlwCnCGPRiNguITesfTJbQvUg==",
       "dev": true,
       "license": "CC-BY-4.0"
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001820",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001820.tgz",
-      "integrity": "sha512-gfWD6MxqVCqAOwmODfZf7DchWvlrA+SRdNX7ceLfg3xRqe5ssjjpF7EgslC/0tiLiNTajdaNN/q8c/5u/7Gz8w==",
+      "version": "1.0.30001819",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001819.tgz",
+      "integrity": "sha512-LFUqIIAwpzsIuevnKnsR9qnStBcgzPShTX61lBwN9uFkkf8o8zLiebEjbW8AYtZiF+1YKDWfdt/pWDtMuG8Xwg==",
       "dev": true,
       "funding": [
         {
@@ -6616,9 +6616,9 @@
       "license": "MIT"
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.5.468",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.468.tgz",
-      "integrity": "sha512-8XdEp3sIqO+PzmVPxhzqHq/3+yCxp44m27cm2WY1sRn3ZhwKyKmqSi2hx6gEhmnOXmh8NUuYE00z6Onzn5m6DA==",
+      "version": "1.5.464",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.464.tgz",
+      "integrity": "sha512-nRa65aFge40viPAKxMKULIY8tcXKwKboJWNn4RoKwyWXJ6SP7BnrDGKUTzc64818jIciH0PK7LSF8QzZes19GA==",
       "dev": true,
       "license": "ISC"
     },
@@ -6640,17 +6640,13 @@
       }
     },
     "node_modules/encodeurl": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.1.tgz",
-      "integrity": "sha512-Ev/hIyePLZtpL98x562lvPtenrUfGr0lfaf44HFZ+hDEwso7ccV9QAZrEVLg0hxNAzygaAFxy2dYaAKKM0G06A==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
+      "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
       "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 0.8"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/express"
       }
     },
     "node_modules/end-of-stream": {
@@ -10195,9 +10191,9 @@
       }
     },
     "node_modules/mdast-util-to-markdown": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/mdast-util-to-markdown/-/mdast-util-to-markdown-2.2.1.tgz",
-      "integrity": "sha512-ThatlCBxG2GE+mljhNSfZPv56d3QrGiRh97jjYgIk80IzS4uU6d7cHAaexCYSAmUCCcOs3grJ07kX3oTGsFUOw==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/mdast-util-to-markdown/-/mdast-util-to-markdown-2.2.0.tgz",
+      "integrity": "sha512-2Jn/ADrHFFyyniBMi0bncTbJqU78K3/TEYvzvwrWWzD9MYPUa/Gm4r3nOeKFQg/PDM5BsbDYdc8ackW4NTY6NA==",
       "license": "MIT",
       "dependencies": {
         "@types/mdast": "^4.0.0",
@@ -11193,9 +11189,9 @@
       }
     },
     "node_modules/node-releases": {
-      "version": "2.0.61",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.61.tgz",
-      "integrity": "sha512-5NUN6QCxNFrS9oEA9RPS+d0AP+ooGBzzovY2JhIpDRHacPvOhHjXjUsUMX9qp4nLHZ+5jVgXB2jj/P4arGOE/g==",
+      "version": "2.0.60",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.60.tgz",
+      "integrity": "sha512-OmO8+GM1JUZqXET720VrJCwkjUCXmCMQm0Z3UDDRbfNLHS4NEAvY60j5jiFv0tkKw2PNNlqOLhahVmwJIOLDIQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -11252,9 +11248,9 @@
       }
     },
     "node_modules/num2fraction": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.3.0.tgz",
-      "integrity": "sha512-rclir6MW4M4Hinz/AnripNvEbz8HRxJ9Qkrtj0V8ivgEsfpxGWGbXDkfCT4IJLEWegu4pvO9qibWpeHkODkGqg==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz",
+      "integrity": "sha512-Y1wZESM7VUThYY+4W+X4ySH2maqcA+p7UR+w8VWNWVAd6lwuXXWz/w/Cz43J/dI2I+PS6wD5N+bJUF+gjWvIqg==",
       "dev": true,
       "license": "MIT"
     },
@@ -12847,9 +12843,9 @@
       }
     },
     "node_modules/qs": {
-      "version": "6.16.2",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.16.2.tgz",
-      "integrity": "sha512-VYdnB5S7/0IeXzBacUtwNAaM6d7Y/PgYnNC7bJCI6meqA/OgnsQbZMtVW8Dt2D1PHgbHGtYmhSoEIgvt7xZ2ZA==",
+      "version": "6.16.1",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.16.1.tgz",
+      "integrity": "sha512-5Px6J7rfHBAGUhNQ3es4YzcOdBBw0SDcVtThJml4RdnKw4tKs2epA0kPZ+K8X+WiHktT93RHVcQ/3ym5aTCgtg==",
       "dev": true,
       "license": "BSD-3-Clause",
       "dependencies": {
@@ -13640,9 +13636,9 @@
       "license": "MIT"
     },
     "node_modules/sass": {
-      "version": "1.107.0",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.107.0.tgz",
-      "integrity": "sha512-+whPilvVNoAD57xvdIPLQT0gXo4RD1lHYw+Uw8zYHlojaeaMDxK14tc0JmEsz/XMns48h3lpypisMP+3E8eHQA==",
+      "version": "1.106.1",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.106.1.tgz",
+      "integrity": "sha512-kD+Gi66vycZcbJt+42NC4z4PXNMcCajVrJPhqoKKXy5cOBMmJQt052CxIBcRjwYXeImHYOpu/ydWWGZQIenl7A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
diff --git a/src/i18n/locales/zh/translations.json b/src/i18n/locales/zh/translations.json
index 809378bd..afdf2dee 100644
--- a/src/i18n/locales/zh/translations.json
+++ b/src/i18n/locales/zh/translations.json
@@ -596,5 +596,8 @@
         "import": "超出限制的行会保留在项目中，但不会被匹配。"
       }
     }
+  },
+  "import": {
+    "bulk_import": "批量导入"
   }
 }

From e2f6730e257d8fcc45c9e1e8e8f37cb64617149d Mon Sep 17 00:00:00 2001
From: Jonathan Payne <paynejd@gmail.com>
Date: Fri, 30 Oct 2026 10:54:25 -0400
Subject: [PATCH 06/14] OpenConceptLab/ocl_online#418 | Tray lists what you
 follow

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 src/common/utils.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/utils.js b/src/common/utils.js
index db615898..85f38a7a 100644
--- a/src/common/utils.js
+++ b/src/common/utils.js
@@ -246,7 +246,7 @@ export const arrayToCSV = objArray => {
 }
 
 export const refreshCurrentUserCache = (callback, onFailure) => {
-  APIService.user().get(null, null, {includeAuthGroups: true, includeSubscribedOrgs: true, includeCapabilities: true}).then(response => {
+  APIService.user().get(null, null, {includeAuthGroups: true, includeSubscribedOrgs: true, includeFollowing: true, includeCapabilities: true}).then(response => {
     if(response?.status === 200) {
       localStorage.setItem('user', JSON.stringify(response.data));
       if(callback) callback(response);

From 3ef5b364eae0a021921abe443d6fc2d642930acd Mon Sep 17 00:00:00 2001
From: Jonathan Payne <paynejd@gmail.com>
Date: Fri, 30 Oct 2026 10:55:07 -0400
Subject: [PATCH 07/14] OpenConceptLab/ocl_online#418 | Tray and footer link to
 the OCL Community website

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 src/common/constants.js                     |  1 +
 src/components/app/Footer.jsx               |  4 ++-
 src/components/app/LeftMenu.jsx             | 31 +++++++++++++++++++++
 src/components/app/__tests__/footer.test.js |  4 ++-
 src/components/users/UserMenu.jsx           |  4 +--
 5 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/src/common/constants.js b/src/common/constants.js
index 62afee14..b97fd17a 100644
--- a/src/common/constants.js
+++ b/src/common/constants.js
@@ -76,5 +76,6 @@ export const MATCHING_ALGORITHMS_DOC_LINK = 'https://docs.openconceptlab.org/en/
 export const MAPPER_DOCS_LINK = 'https://docs.openconceptlab.org/en/latest/oclmap/overview.html'
 export const MAPPER_ANNOUNCEMENT_LETTER_URL = 'https://openconceptlab.org/blog/letter-to-the-ocl-community?utm_source=oclmap&utm_medium=banner&utm_campaign=subscription_dates'
 export const MAPPER_ANNOUNCEMENT_PRICING_URL = 'https://openconceptlab.org/pricing?utm_source=oclmap&utm_medium=banner&utm_campaign=subscription_dates'
+export const COMMUNITY_SITE_URL = 'https://openconceptlab.org'
 export const TERMS_OF_USE_URL = 'https://openconceptlab.org/terms-of-use'
 export const PRIVACY_POLICY_URL = 'https://openconceptlab.org/privacy-policy'
diff --git a/src/components/app/Footer.jsx b/src/components/app/Footer.jsx
index bb59b7e8..1e2ef8cc 100644
--- a/src/components/app/Footer.jsx
+++ b/src/components/app/Footer.jsx
@@ -6,7 +6,7 @@ import { get } from 'lodash';
 import {
   getAppliedServerConfig
 } from '../../common/utils';
-import { TERMS_OF_USE_URL, PRIVACY_POLICY_URL } from '../../common/constants';
+import { COMMUNITY_SITE_URL, TERMS_OF_USE_URL, PRIVACY_POLICY_URL } from '../../common/constants';
 import AppVersions from './AppVersions';
 import './Footer.scss';
 
@@ -44,6 +44,8 @@ const Footer = () => {
     <footer ref={ref} className='col-sm-12 footer-container flex-vertical-center' style={{textAlign: 'right'}}>
       {/* On every page, signed in or not: using the Mapper means accepting the Terms of Use */}
       <div className='footer-legal flex-vertical-center'>
+        <Link href={COMMUNITY_SITE_URL} target='_blank' rel='noopener noreferrer' underline='hover' sx={LEGAL_LINK_SX}>{t('common.community_website')}</Link>
+        <Divider orientation='vertical' className='footer-divider-vertical' />
         <Link href={TERMS_OF_USE_URL} target='_blank' rel='noopener noreferrer' underline='hover' sx={LEGAL_LINK_SX}>{t('common.terms_of_use')}</Link>
         <Divider orientation='vertical' className='footer-divider-vertical' />
         <Link href={PRIVACY_POLICY_URL} target='_blank' rel='noopener noreferrer' underline='hover' sx={LEGAL_LINK_SX}>{t('common.privacy_policy')}</Link>
diff --git a/src/components/app/LeftMenu.jsx b/src/components/app/LeftMenu.jsx
index dd57f45e..13487030 100644
--- a/src/components/app/LeftMenu.jsx
+++ b/src/components/app/LeftMenu.jsx
@@ -10,9 +10,11 @@ import ListItemIcon from '@mui/material/ListItemIcon';
 import ListItemText from '@mui/material/ListItemText';
 import DashboardIcon from '@mui/icons-material/Dashboard';
 import FolderOpenIcon from '@mui/icons-material/FolderOutlined';
+import CommunityIcon from '@mui/icons-material/GroupsOutlined';
 import Divider from '@mui/material/Divider';
 import map from 'lodash/map'
 import { PRIMARY_COLORS } from '../../common/colors'
+import { COMMUNITY_SITE_URL } from '../../common/constants'
 import { getCurrentUser, refreshCurrentUserCache, getCurrentUserOrgs, hasTermBrowser, toV3URL } from '../../common/utils';
 import Drawer from '../common/Drawer';
 import OrgIcon from '../orgs/OrgIcon';
@@ -230,6 +232,35 @@ const LeftMenu = ({ isOpen, onClose }) => {
       </List>
         </>
       )}
+      <Divider style={{width: '100%', marginTop: 'auto'}} />
+      <List sx={{p: 0}}>
+        <ListItem disablePadding sx={{ display: 'block' }}>
+          <ListItemButton
+            onClick={onClose}
+            href={COMMUNITY_SITE_URL}
+            target='_blank'
+            rel='noopener noreferrer'
+            className='no-anchor-styles'
+            sx={{
+              minHeight: 56,
+              justifyContent: 'initial',
+              px: 2,
+              borderRadius: '100px'
+            }}
+          >
+            <ListItemIcon
+              sx={{
+                minWidth: 0,
+                mr: 1.75,
+                justifyContent: 'center',
+              }}
+            >
+              <CommunityIcon />
+            </ListItemIcon>
+            <ListItemText primary={t('common.community_website')} />
+          </ListItemButton>
+        </ListItem>
+      </List>
     </Drawer>
   )
 }
diff --git a/src/components/app/__tests__/footer.test.js b/src/components/app/__tests__/footer.test.js
index 5871b681..b01d6627 100644
--- a/src/components/app/__tests__/footer.test.js
+++ b/src/components/app/__tests__/footer.test.js
@@ -1,6 +1,7 @@
 /**
  * The footer, on every page, links OCL's Terms of Use and Privacy Policy
- * (OpenConceptLab/ocl_issues#2900).
+ * (OpenConceptLab/ocl_issues#2900) and the OCL Community website
+ * (OpenConceptLab/ocl_online#418).
  *
  * Footer is JSX, which these tests can't mount (they run without a JSX
  * transform), so this reads its source: each link must go to the page's URL,
@@ -14,6 +15,7 @@ import { readFileSync } from 'node:fs'
 import babel from '@babel/core'
 
 const LINKS = {
+  'https://openconceptlab.org': 'OCL Community website',
   'https://openconceptlab.org/terms-of-use': 'Terms of Use',
   'https://openconceptlab.org/privacy-policy': 'Privacy Policy',
 }
diff --git a/src/components/users/UserMenu.jsx b/src/components/users/UserMenu.jsx
index 35476d0c..809790ce 100644
--- a/src/components/users/UserMenu.jsx
+++ b/src/components/users/UserMenu.jsx
@@ -17,7 +17,7 @@ import ChatIcon from '@mui/icons-material/ForumOutlined';
 import CommunityIcon from '@mui/icons-material/GroupsOutlined';
 import find from 'lodash/find';
 import { getCurrentUser, logoutUser, isLoggedIn, getLoginURL, getRegisterURL, toV3URL } from '../../common/utils'
-import { LANGUAGES } from '../../common/constants';
+import { LANGUAGES, COMMUNITY_SITE_URL } from '../../common/constants';
 import Button from '../common/Button';
 import Link from '../common/Link';
 import Drawer from '../common/Drawer';
@@ -120,7 +120,7 @@ const UserMenu = ({ isOpen, onClose }) => {
         <Divider style={{width: '100%'}} />
         <div className='col-xs-12 padding-0'>
           <List>
-            <ListItemButton sx={{p: 1, borderRadius: '100px'}} component='a' className='no-anchor-styles' href='https://openconceptlab.org' target='_blank' rel='noopener noreferrer'>
+            <ListItemButton sx={{p: 1, borderRadius: '100px'}} component='a' className='no-anchor-styles' href={COMMUNITY_SITE_URL} target='_blank' rel='noopener noreferrer'>
               <ListItemIcon sx={{minWidth: 'auto', paddingRight: '14px'}}>
                 <CommunityIcon />
               </ListItemIcon>

From 66cba486d6878be3ae47476af235222e63b3a618 Mon Sep 17 00:00:00 2001
From: Jonathan Payne <paynejd@gmail.com>
Date: Fri, 30 Oct 2026 10:59:22 -0400
Subject: [PATCH 08/14] OpenConceptLab/ocl_online#418 | Leaving an unsaved new
 project asks first, with Save and leave

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 src/components/map-projects/MapProject.jsx    | 85 +++++++++++++++++--
 .../map-projects/__tests__/leaveGuard.test.js | 26 +++++-
 src/components/map-projects/leaveGuard.js     | 16 +++-
 src/i18n/locales/en/translations.json         |  4 +
 src/i18n/locales/es/translations.json         |  4 +
 src/i18n/locales/pt-BR/translations.json      |  4 +
 src/i18n/locales/zh/translations.json         |  4 +
 7 files changed, 131 insertions(+), 12 deletions(-)

diff --git a/src/components/map-projects/MapProject.jsx b/src/components/map-projects/MapProject.jsx
index 4ec0ce7e..c8087b49 100644
--- a/src/components/map-projects/MapProject.jsx
+++ b/src/components/map-projects/MapProject.jsx
@@ -94,7 +94,7 @@ import DataGridControls from './DataGridControls'
 import { getPreviewEligibleRowIndexes, getRowsToProcess, countAIOnlyRows, getAutoMatchAIOnOpen, takeRunRows, clearRunRowStatuses, canRunAlgorithm, spendsMatchQuota, shouldStopAIStep, getAIRequestIdempotencyKey, getCandidatePoolFingerprint, hasCurrentAnalysis, getScispacyRowResults, getPendingRowLookups, waitForLookups, AI_LOOKUP_WAIT_MS, RERANK_LOOKUP_WAIT_MS, RERANK_MAX_IN_FLIGHT, isScispacyWarmingUp } from './autoMatchRows'
 import { aiOnByDefault, getMaxRunRows, getMapperSettings } from '@openconceptlab/oclmap-extensions'
 import { createAutosaveScheduler, createLatestSender, saveOnLeave, trackSave, whenSaved, installUnloadGuard } from './autosave'
-import { blockLeaving, continueLeaving, createRunClosers } from './leaveGuard'
+import { blockLeaving, continueLeaving, createRunClosers, isUnsavedNewProject, shouldAskBeforeLeaving, shouldWarnBeforeUnload } from './leaveGuard'
 import MatchSummaryCard from './MatchSummaryCard'
 import MappingDecisionResult from './MappingDecisionResult'
 import DecisionSelector from './DecisionSelector'
@@ -286,7 +286,9 @@ const MapProject = () => {
   if(!runClosersRef.current)
     runClosersRef.current = createRunClosers()
   const isRunActiveRef = React.useRef(false)
+  const hasInputRef = React.useRef(false)
   const [leaveTarget, setLeaveTarget] = React.useState(null)
+  const [isSavingToLeave, setIsSavingToLeave] = React.useState(false)
   const ownNavigationRef = React.useRef(false)
   const refreshRowStageSnapshotRef = React.useRef({});
 
@@ -416,12 +418,20 @@ const MapProject = () => {
     }
   }, [])
 
-  // Closing or reloading the tab inside the autosave window, or while a save
-  // is in flight, would lose the change, so ask first. installUnloadGuard
-  // covers a save that outlives this page.
+  // Closing or reloading the tab, or following a link to another site, inside
+  // the autosave window, while a save is in flight, or before a new project's
+  // first save would lose work, so ask first. installUnloadGuard covers a save
+  // that outlives this page.
   React.useEffect(() => {
     const warnIfUnsaved = event => {
-      if(!autosaveSchedulerRef.current.hasPending() && !inFlightSaveRef.current && !isRunActiveRef.current)
+      const warn = shouldWarnBeforeUnload({
+        pendingAutosave: autosaveSchedulerRef.current.hasPending(),
+        saveInFlight: inFlightSaveRef.current,
+        runActive: isRunActiveRef.current,
+        projectId: projectIdRef.current,
+        hasInput: hasInputRef.current,
+      })
+      if(!warn)
         return
       event.preventDefault()
       event.returnValue = ''
@@ -1764,6 +1774,7 @@ const MapProject = () => {
     // Where the user was when saving: a save that lands once they went
     // elsewhere mustn't pull them back.
     const pathAtSave = history.location.pathname
+    // Resolves true once the project saved.
     const request = service.then(response => {
       setIsSaving(false)
       const status = response?.response?.status || response?.status
@@ -1807,6 +1818,7 @@ const MapProject = () => {
           baseSetAlert({severity: 'success', message: t('map_project.successfully_saved'), duration: 2000})
 
         postProjectLogs(response.data.url, {row_logs: savedRowLogs, project_logs: savedProjectLogs})
+        return true
       } else if(options.leaving && status !== 401) {
         // The user has left the project, so no dialog can show: say so once.
         baseSetAlert({severity: 'error', message: t('map_project.leave_save_failed', {name: name || project?.name, detail: errorData?.detail || t('unknown_error')}), duration: 12000})
@@ -1815,6 +1827,7 @@ const MapProject = () => {
       } else if(!isAutoSave && status !== 429 && status !== 401) {
         baseSetAlert({severity: 'error', message: errorData?.detail || t('unknown_error'), duration: 8000})
       }
+      return false
     }).finally(() => {
       setIsSaving(false)
       if(inFlightSaveRef.current === request)
@@ -2911,12 +2924,15 @@ const MapProject = () => {
   const isRunningBulkBridgeCandidates = bridgeCandidatesEndedAt ? moment().isBetween(bridgeCandidatesStartedAt, bridgeCandidatesEndedAt) : Boolean(bridgeCandidatesStartedAt)
   const isRunningBulkScispacyCandidates = scispacyCandidatesEndedAt ? moment().isBetween(scispacyCandidatesStartedAt, scispacyCandidatesEndedAt) : Boolean(scispacyCandidatesStartedAt)
 
-  // Leaving while a run is going asks first.
+  // Leaving while a run is going, or before a new project's first save, asks first.
   const isRunActive = Boolean(loadingMatches || isRunningBulkAnalysis || isRunningBulkBridgeCandidates || isRunningBulkScispacyCandidates)
   isRunActiveRef.current = isRunActive
+  hasInputRef.current = Boolean(file)
+  const isUnsavedNew = isUnsavedNewProject({projectId: project?.id, hasInput: file})
+  const askBeforeLeaving = shouldAskBeforeLeaving({runActive: isRunActive, projectId: project?.id, hasInput: file})
   const unblockLeavingRef = React.useRef(null)
   React.useEffect(() => {
-    if(!isRunActive)
+    if(!askBeforeLeaving)
       return
     const unblock = blockLeaving(history, {
       isAllowed: () => ownNavigationRef.current,
@@ -2927,7 +2943,7 @@ const MapProject = () => {
       unblockLeavingRef.current = null
       unblock()
     }
-  }, [isRunActive])
+  }, [askBeforeLeaving])
 
   const onStopRunAndLeave = () => {
     const target = leaveTarget
@@ -2940,6 +2956,38 @@ const MapProject = () => {
       continueLeaving(history, target)
   }
 
+  const leaveTo = target => {
+    unblockLeavingRef.current?.()
+    unblockLeavingRef.current = null
+    if(target)
+      continueLeaving(history, target)
+  }
+
+  const onLeaveUnsaved = () => {
+    const target = leaveTarget
+    setLeaveTarget(null)
+    leaveTo(target)
+  }
+
+  // Leaves only once the first save lands; a save already in flight is
+  // awaited rather than sent again, which would create a second project.
+  const onSaveAndLeave = () => {
+    const target = leaveTarget
+    const request = inFlightSaveRef.current || onSave({source: 'manual'})
+    if(!request) {
+      setLeaveTarget(null)
+      return
+    }
+    const done = saved => {
+      setIsSavingToLeave(false)
+      setLeaveTarget(null)
+      if(saved === true)
+        leaveTo(target)
+    }
+    setIsSavingToLeave(true)
+    Promise.resolve(request).then(done, () => done(false))
+  }
+
   // Only the latest request may set the version: a slower response is for a
   // repository no longer chosen.
   const versionsRequestRef = React.useRef(0)
@@ -6861,7 +6909,26 @@ const MapProject = () => {
         }
     </Paper>
     </Split>
-      <Dialog open={Boolean(leaveTarget)} onClose={() => setLeaveTarget(null)} maxWidth='xs' fullWidth>
+      <Dialog open={Boolean(leaveTarget) && isUnsavedNew && !isRunActive} onClose={() => !isSavingToLeave && setLeaveTarget(null)} maxWidth='xs' fullWidth>
+        <DialogTitle>{t('map_project.leave_unsaved_title')}</DialogTitle>
+        <DialogContent>
+          <Typography component='p' sx={{fontSize: '14px', color: 'surface.dark'}}>
+            {t('map_project.leave_unsaved_body')}
+          </Typography>
+        </DialogContent>
+        <DialogActions>
+          <Button onClick={() => setLeaveTarget(null)} disabled={isSavingToLeave} color='secondary' sx={{textTransform: 'none'}}>
+            {t('common.cancel')}
+          </Button>
+          <Button onClick={onLeaveUnsaved} disabled={isSavingToLeave} color='error' sx={{textTransform: 'none'}}>
+            {t('map_project.leave')}
+          </Button>
+          <Button onClick={onSaveAndLeave} disabled={isSavingToLeave} variant='contained' sx={{textTransform: 'none'}}>
+            {t('map_project.save_and_leave')}
+          </Button>
+        </DialogActions>
+      </Dialog>
+      <Dialog open={Boolean(leaveTarget) && (isRunActive || !isUnsavedNew)} onClose={() => setLeaveTarget(null)} maxWidth='xs' fullWidth>
         <DialogTitle>{t('map_project.leave_while_running_title')}</DialogTitle>
         <DialogContent>
           <Typography component='p' sx={{fontSize: '14px', color: 'surface.dark'}}>
diff --git a/src/components/map-projects/__tests__/leaveGuard.test.js b/src/components/map-projects/__tests__/leaveGuard.test.js
index f4c99165..548a62f0 100644
--- a/src/components/map-projects/__tests__/leaveGuard.test.js
+++ b/src/components/map-projects/__tests__/leaveGuard.test.js
@@ -1,11 +1,12 @@
 /**
- * Tests for leaving a project while Auto Match runs.
+ * Tests for leaving a project while Auto Match runs, or before a new
+ * project's first save.
  */
 
 import test from 'node:test'
 import assert from 'node:assert/strict'
 
-import { blockLeaving, continueLeaving, createRunClosers, getPageKey } from '../leaveGuard.js'
+import { blockLeaving, continueLeaving, createRunClosers, getPageKey, isUnsavedNewProject, shouldAskBeforeLeaving, shouldWarnBeforeUnload } from '../leaveGuard.js'
 
 // Stands in for a history v4 object: block's prompt decides each transition.
 const createFakeHistory = () => {
@@ -192,3 +193,24 @@ test('continueLeaving keeps other state', () => {
   continueLeaving(history, {location: {pathname: '/x', state: {mapProjectFrom: '/y', other: 1}}, action: 'PUSH'})
   assert.deepEqual(history.calls[0].location.state, {other: 1})
 })
+
+test('a new project with a file loaded is unsaved until it has an id', () => {
+  assert.equal(isUnsavedNewProject({projectId: undefined, hasInput: {name: 'terms.csv'}}), true)
+  assert.equal(isUnsavedNewProject({projectId: undefined, hasInput: false}), false)
+  assert.equal(isUnsavedNewProject({projectId: 42, hasInput: {name: 'terms.csv'}}), false)
+})
+
+test('in-app navigation asks first for a run or an unsaved new project only', () => {
+  assert.equal(shouldAskBeforeLeaving({runActive: false, projectId: 42, hasInput: true}), false)
+  assert.equal(shouldAskBeforeLeaving({runActive: true, projectId: 42, hasInput: true}), true)
+  assert.equal(shouldAskBeforeLeaving({runActive: false, projectId: null, hasInput: true}), true)
+  assert.equal(shouldAskBeforeLeaving({runActive: false, projectId: null, hasInput: false}), false)
+})
+
+test('closing the tab also warns while a change waits to be saved', () => {
+  const saved = {runActive: false, projectId: 42, hasInput: true}
+  assert.equal(shouldWarnBeforeUnload({...saved, pendingAutosave: false, saveInFlight: false}), false)
+  assert.equal(shouldWarnBeforeUnload({...saved, pendingAutosave: true, saveInFlight: false}), true)
+  assert.equal(shouldWarnBeforeUnload({...saved, pendingAutosave: false, saveInFlight: true}), true)
+  assert.equal(shouldWarnBeforeUnload({pendingAutosave: false, saveInFlight: false, runActive: false, projectId: null, hasInput: true}), true)
+})
diff --git a/src/components/map-projects/leaveGuard.js b/src/components/map-projects/leaveGuard.js
index 8f0f3d79..ccbf5122 100644
--- a/src/components/map-projects/leaveGuard.js
+++ b/src/components/map-projects/leaveGuard.js
@@ -1,4 +1,18 @@
-// Leaving a project while Auto Match runs.
+// Leaving a project while Auto Match runs, or before a new project's first save.
+
+// A new project exists only on this page until its first save: leaving with
+// its file loaded discards it. A saved project autosaves instead.
+export const isUnsavedNewProject = ({projectId, hasInput}) => !projectId && Boolean(hasInput)
+
+// In-app navigation unmounts the page, which saves a saved project's pending
+// change, so only a run or an unsaved new project needs asking first.
+export const shouldAskBeforeLeaving = ({runActive, projectId, hasInput}) =>
+  Boolean(runActive) || isUnsavedNewProject({projectId, hasInput})
+
+// Closing the tab or opening another site gets no unmount save: ask while a
+// change waits for autosave or a save is in flight too.
+export const shouldWarnBeforeUnload = ({pendingAutosave, saveInFlight, runActive, projectId, hasInput}) =>
+  Boolean(pendingAutosave || saveInFlight) || shouldAskBeforeLeaving({runActive, projectId, hasInput})
 
 // Holds in-app navigation, unless isAllowed, and hands it to onBlocked as
 // {location, action}. Returns the unblock function.
diff --git a/src/i18n/locales/en/translations.json b/src/i18n/locales/en/translations.json
index 191b92b6..1f256647 100644
--- a/src/i18n/locales/en/translations.json
+++ b/src/i18n/locales/en/translations.json
@@ -356,6 +356,10 @@
     "leave_while_running_body_unsaved": "This project isn't saved yet. Leaving stops the run now and discards the project and its results.",
     "stay": "Stay",
     "stop_and_leave": "Stop and leave",
+    "leave_unsaved_title": "Leave without saving?",
+    "leave_unsaved_body": "This project isn't saved yet. If you leave, it's discarded along with everything you've done in it.",
+    "leave": "Leave",
+    "save_and_leave": "Save and leave",
     "auto_match_all_including_approved_confirm": "I understand that {{approvedCount}} approved decisions will be overwritten",
     "auto_match_selected_rows_note_no_count": "Select rows in the left panel to enable this option",
     "auto_match_rows_failed": "Matching failed for {{count}} input row(s), so they're missing candidates: {{details}}. Rows count from the first data row of your file. Run AutoMatch on those rows again to retry them.",
diff --git a/src/i18n/locales/es/translations.json b/src/i18n/locales/es/translations.json
index e46e7abb..981f2d41 100644
--- a/src/i18n/locales/es/translations.json
+++ b/src/i18n/locales/es/translations.json
@@ -342,6 +342,10 @@
     "leave_while_running_body_unsaved": "Este proyecto aún no se ha guardado. Salir detiene la ejecución ahora y descarta el proyecto y sus resultados.",
     "stay": "Quedarse",
     "stop_and_leave": "Detener y salir",
+    "leave_unsaved_title": "¿Salir sin guardar?",
+    "leave_unsaved_body": "Este proyecto aún no se ha guardado. Si sale, se descartará junto con todo lo que ha hecho en él.",
+    "leave": "Salir",
+    "save_and_leave": "Guardar y salir",
     "auto_match_all_including_approved_confirm": "Entiendo que se sobrescribirán {{approvedCount}} decisiones aprobadas",
     "auto_match_selected_rows_note_no_count": "Seleccione filas en el panel izquierdo para habilitar esta opción",
     "auto_match_rows_failed": "La coincidencia falló en {{count}} fila(s) de entrada, así que les faltan candidatos: {{details}}. Las filas se cuentan desde la primera fila de datos de tu archivo. Vuelve a ejecutar AutoMatch en esas filas para reintentarlo.",
diff --git a/src/i18n/locales/pt-BR/translations.json b/src/i18n/locales/pt-BR/translations.json
index e154cd35..c8963fd0 100644
--- a/src/i18n/locales/pt-BR/translations.json
+++ b/src/i18n/locales/pt-BR/translations.json
@@ -356,6 +356,10 @@
     "leave_while_running_body_unsaved": "Este projeto ainda não foi salvo. Sair interrompe a execução agora e descarta o projeto e seus resultados.",
     "stay": "Ficar",
     "stop_and_leave": "Parar e sair",
+    "leave_unsaved_title": "Sair sem salvar?",
+    "leave_unsaved_body": "Este projeto ainda não foi salvo. Se você sair, ele será descartado junto com tudo o que você fez nele.",
+    "leave": "Sair",
+    "save_and_leave": "Salvar e sair",
     "auto_match_all_including_approved_confirm": "Entendo que {{approvedCount}} decisões aprovadas serão sobrescritas",
     "auto_match_selected_rows_note_no_count": "Selecione linhas no painel esquerdo para habilitar esta opção",
     "auto_match_rows_failed": "O AutoMatch falhou para {{count}} linha(s) de entrada, então elas estão sem candidatos: {{details}}. As linhas contam a partir da primeira linha de dados do seu arquivo. Execute o AutoMatch nessas linhas novamente para tentar de novo.",
diff --git a/src/i18n/locales/zh/translations.json b/src/i18n/locales/zh/translations.json
index afdf2dee..c24c12b4 100644
--- a/src/i18n/locales/zh/translations.json
+++ b/src/i18n/locales/zh/translations.json
@@ -354,6 +354,10 @@
     "leave_while_running_body_unsaved": "此项目尚未保存。离开会立即停止运行，并丢弃该项目及其结果。",
     "stay": "留下",
     "stop_and_leave": "停止并离开",
+    "leave_unsaved_title": "不保存就离开？",
+    "leave_unsaved_body": "此项目尚未保存。如果离开，项目及其中的所有工作都将被丢弃。",
+    "leave": "离开",
+    "save_and_leave": "保存并离开",
     "auto_match_all_including_approved_confirm": "我明白将覆盖 {{approvedCount}} 个已批准的决策",
     "auto_match_selected_rows_note_no_count": "请在左侧面板选择行以启用此选项",
     "auto_match_rows_failed": "{{count}} 个输入行匹配失败，缺少候选项：{{details}}。行号从文件的第一个数据行开始计数。请对这些行重新运行 AutoMatch 以重试。",

From e9e589886663a1acca959b7bbf7950236515974c Mon Sep 17 00:00:00 2001
From: Jonathan Payne <paynejd@gmail.com>
Date: Fri, 30 Oct 2026 11:01:11 -0400
Subject: [PATCH 09/14] OpenConceptLab/ocl_online#418 | Header search: a
 magnifier opens TBv3's search, for this project's rows or all of OCL

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 src/components/app/Header.jsx                 |   8 +-
 src/components/app/HeaderControls.jsx         |   2 +
 src/components/app/HeaderSearch.jsx           | 201 ++++++++++++++++--
 src/components/app/LayoutContext.jsx          |   6 +-
 .../app/__tests__/headerSearch.test.js        |  22 ++
 src/components/app/headerSearch.js            |  12 ++
 .../map-projects/DataGridControls.jsx         |   5 +-
 src/components/map-projects/MapProject.jsx    |  18 +-
 src/components/map-projects/SearchField.jsx   |   8 +-
 src/i18n/locales/en/translations.json         |  10 +-
 src/i18n/locales/es/translations.json         |  10 +-
 src/i18n/locales/pt-BR/translations.json      |  10 +-
 src/i18n/locales/zh/translations.json         |  10 +-
 13 files changed, 290 insertions(+), 32 deletions(-)
 create mode 100644 src/components/app/__tests__/headerSearch.test.js
 create mode 100644 src/components/app/headerSearch.js

diff --git a/src/components/app/Header.jsx b/src/components/app/Header.jsx
index e6bcd030..2489e1c7 100644
--- a/src/components/app/Header.jsx
+++ b/src/components/app/Header.jsx
@@ -8,11 +8,10 @@ import CssBaseline from '@mui/material/CssBaseline';
 import MenuIcon from '@mui/icons-material/Menu';
 import { COLORS } from '../../common/colors';
 import OCLLogo from '../common/OCLLogo';
-import { getCurrentUser, hasTermBrowser } from '../../common/utils';
+import { getCurrentUser } from '../../common/utils';
 import './Header.scss';
 import HeaderControls from './HeaderControls';
 import LeftMenu from './LeftMenu'
-import HeaderSearch from './HeaderSearch'
 import AnnouncementBanner from './AnnouncementBanner';
 
 
@@ -65,10 +64,7 @@ const Header = props => {
               }
               <OCLLogo />
             </div>
-            <div className='col-xs-3' />
-            <div className='col-xs-4 padding-0' style={{textAlign: 'center'}}>
-              {Boolean(user?.url) && hasTermBrowser() && <HeaderSearch />}
-            </div>
+            <div className='col-xs-8' />
             <HeaderControls />
           </div>
         </Toolbar>
diff --git a/src/components/app/HeaderControls.jsx b/src/components/app/HeaderControls.jsx
index 64e43496..ae5d4ad2 100644
--- a/src/components/app/HeaderControls.jsx
+++ b/src/components/app/HeaderControls.jsx
@@ -4,6 +4,7 @@ import AddIcon from '@mui/icons-material/Add'
 import UserMenu from '../users/UserMenu';
 import UserProfileButton from '../users/UserProfileButton';
 import AddMenuList from '../users/AddMenuList'
+import HeaderSearch from './HeaderSearch'
 import { isLoggedIn } from '../../common/utils';
 
 
@@ -15,6 +16,7 @@ const HeaderControls = () => {
 
   return (
     <div className='col-xs-4 padding-0' style={{textAlign: 'right'}}>
+      {authenticated && <HeaderSearch />}
       {
         authenticated &&
           <IconButton sx={{marginRight: '8px'}} aria-label='create' onClick={event => setAddMenuAnchorEl(event.currentTarget)}>
diff --git a/src/components/app/HeaderSearch.jsx b/src/components/app/HeaderSearch.jsx
index c690b457..ca49e340 100644
--- a/src/components/app/HeaderSearch.jsx
+++ b/src/components/app/HeaderSearch.jsx
@@ -1,30 +1,197 @@
 import React from 'react';
 import { useTranslation } from 'react-i18next'
-import InputAdornment from '@mui/material/InputAdornment';
-import TextField from '@mui/material/TextField';
-import SearchIcon from '@mui/icons-material/Search';
-import { getV3URL } from '../../common/utils';
+import Drawer from '@mui/material/Drawer'
+import Divider from '@mui/material/Divider'
+import IconButton from '@mui/material/IconButton'
+import InputAdornment from '@mui/material/InputAdornment'
+import ListItem from '@mui/material/ListItem'
+import ListItemAvatar from '@mui/material/ListItemAvatar'
+import ListItemButton from '@mui/material/ListItemButton'
+import ListItemText from '@mui/material/ListItemText'
+import TextField from '@mui/material/TextField'
+import SearchIcon from '@mui/icons-material/Search'
+import CloseIcon from '@mui/icons-material/Close'
+import EnterIcon from '@mui/icons-material/SubdirectoryArrowLeft'
+import UpIcon from '@mui/icons-material/ArrowUpward'
+import DownIcon from '@mui/icons-material/ArrowDownward'
+import { getV3URL, hasTermBrowser } from '../../common/utils'
+import { OperationsContext } from './LayoutContext'
+import { headerSearchOptions, oclSearchURL } from './headerSearch'
+
+// Ported from TBv3's SearchInput and SearchInputDrawer, so search looks and
+// behaves the same in both apps. A magnifier opens the drawer, which searches
+// the open project's rows or all of OCL.
+
+const Key = ({ icon, style }) => (
+  <span style={{display: 'flex', padding: '4px', background: '#FFF', color: '#47464f', boxShadow: '0 0 5px 0 rgba(120, 118, 128, 0.6)', borderRadius: '4px', ...(style || {})}}>
+    {icon}
+  </span>
+)
+
+const Option = ({ id, label, hint, selected, onClick }) => (
+  <ListItemButton id={id} sx={{padding: '12px'}} selected={selected} onClick={onClick}>
+    <ListItemAvatar sx={{minWidth: '32px'}}>
+      <SearchIcon color={selected ? 'primary' : undefined} />
+    </ListItemAvatar>
+    <ListItemText primary={label} sx={{paddingRight: '4px'}} />
+    <span style={{display: 'flex', alignItems: 'center', color: '#47464f', fontSize: '12px', textAlign: 'right'}}>
+      {
+        selected &&
+          <Key icon={<EnterIcon style={{fontSize: '12px'}} />} style={{marginRight: '8px', color: 'inherit'}} />
+      }
+      <span style={{display: 'flex'}}>{hint}</span>
+    </span>
+  </ListItemButton>
+)
 
 const HeaderSearch = () => {
   const { t } = useTranslation()
-  const [value, setValue] = React.useState('')
+  const { projectRowSearch } = React.useContext(OperationsContext)
+  const [open, setOpen] = React.useState(false)
+  const [input, setInput] = React.useState('')
+  const [focus, setFocus] = React.useState(0)
+  const options = headerSearchOptions({canSearchRows: Boolean(projectRowSearch), canSearchOCL: hasTermBrowser()})
+
+  // Cmd/Ctrl + / opens it, as in TBv3
+  React.useEffect(() => {
+    if(!options.length)
+      return
+    const onGlobalKeyDown = event => {
+      if((event.metaKey || event.ctrlKey) && event.key === '/') {
+        event.preventDefault()
+        setOpen(true)
+      }
+    }
+    document.addEventListener('keydown', onGlobalKeyDown)
+    return () => document.removeEventListener('keydown', onGlobalKeyDown)
+  }, [options.length])
+
+  if(!options.length)
+    return null
+
+  const onClose = () => {
+    setOpen(false)
+    setFocus(0)
+  }
+
+  const search = option => {
+    onClose()
+    if(option === 'rows')
+      projectRowSearch.search(input.trim())
+    else
+      window.location.assign(oclSearchURL(getV3URL(), input))
+  }
 
   const onKeyDown = event => {
-    const query = value.trim()
-    if(event.key === 'Enter' && query)
-      window.location.assign(`${getV3URL()}/search/?q=${encodeURIComponent(query)}&type=concepts`)
+    if(event.key === 'Enter') {
+      event.preventDefault()
+      if(input.trim())
+        search(options[focus] || options[0])
+    } else if(event.key === 'ArrowDown' || event.key === 'ArrowUp') {
+      event.preventDefault()
+      const step = event.key === 'ArrowDown' ? 1 : -1
+      setFocus((focus + step + options.length) % options.length)
+    }
+  }
+
+  const query = <b>{input || '...'}</b>
+  const LABELS = {
+    rows: {label: <span>{t('search.search_project_rows')}"{query}"</span>, hint: t('search.search_project_rows_hint')},
+    ocl: {label: <span>{t('search.search_all_site')}"{query}"</span>, hint: t('search.search_all_concepts')},
   }
 
   return (
-    <TextField
-      size='small'
-      fullWidth
-      value={value}
-      placeholder={t('search.input_placeholder')}
-      onChange={event => setValue(event.target.value)}
-      onKeyDown={onKeyDown}
-      InputProps={{startAdornment: <InputAdornment position='start'><SearchIcon /></InputAdornment>, sx: {borderRadius: '100px'}}}
-    />
+    <React.Fragment>
+      <IconButton sx={{marginRight: '8px'}} aria-label={t('common.search')} onClick={() => setOpen(true)}>
+        <SearchIcon />
+      </IconButton>
+      <Drawer
+        transitionDuration={0}
+        ModalProps={{keepMounted: false}}
+        sx={{
+          zIndex: '1202',
+          '& .MuiDrawer-paper': {
+            borderRadius: '20px',
+            padding: 0,
+            top: 'calc(14px + var(--announcement-height, 0px))',
+            width: '600px',
+            maxWidth: 'calc(100vw - 32px)',
+            margin: '0 auto',
+            minHeight: '64px'
+          },
+        }}
+        anchor='top'
+        open={open}
+        onClose={onClose}
+      >
+        <TextField
+          id='header-search-input'
+          autoFocus
+          className='rounded-input'
+          value={input}
+          autoComplete='off'
+          placeholder={t('search.input_placeholder_drawer')}
+          onChange={event => setInput(event.target.value)}
+          onKeyDown={onKeyDown}
+          onFocus={event => event.target.select()}
+          slotProps={{
+            input: {
+              startAdornment: (
+                <InputAdornment position='start'>
+                  <SearchIcon />
+                </InputAdornment>
+              ),
+              endAdornment: (
+                input &&
+                  <InputAdornment position='end'>
+                    <IconButton size='small' aria-label={t('common.clear')} onClick={() => setInput('')}>
+                      <CloseIcon style={{color: '#000'}} />
+                    </IconButton>
+                  </InputAdornment>
+              )
+            }
+          }}
+          sx={{
+            padding: '12px',
+            height: '60px',
+            '.MuiInputBase-root': {
+              padding: 0
+            }
+          }}
+        />
+        {
+          Boolean(input) &&
+            <React.Fragment>
+              {
+                options.map((option, index) => (
+                  <Option
+                    key={option}
+                    id={`header_search_${option}`}
+                    label={LABELS[option].label}
+                    hint={LABELS[option].hint}
+                    selected={focus === index}
+                    onClick={() => search(option)}
+                  />
+                ))
+              }
+              <Divider />
+            </React.Fragment>
+        }
+        <ListItem sx={{padding: '12px', backgroundColor: '#fffbff'}}>
+          <ListItemText
+            primary={
+              <span style={{display: 'flex', alignItems: 'center', fontSize: '12px', color: '#5e5c71', marginLeft: '4px'}}>
+                <Key icon={<UpIcon style={{fontSize: '12px'}} />} style={{marginRight: '8px'}} />
+                <Key icon={<DownIcon style={{fontSize: '12px'}} />} style={{marginRight: '8px'}} />
+                {t('common.navigate')}
+                <Key icon={<EnterIcon style={{fontSize: '12px'}} />} style={{margin: '0 8px 0 16px'}} />
+                {t('common.select')}
+              </span>
+            }
+          />
+        </ListItem>
+      </Drawer>
+    </React.Fragment>
   )
 }
 
diff --git a/src/components/app/LayoutContext.jsx b/src/components/app/LayoutContext.jsx
index 5dce685c..8ef7c213 100644
--- a/src/components/app/LayoutContext.jsx
+++ b/src/components/app/LayoutContext.jsx
@@ -11,6 +11,8 @@ const LayoutContext = ({ subPages }) => {
   const [parentItem, setParentItem] = React.useState(null);
   const [toggles, setToggles] = React.useState({});
   const [alert, setAlert] = React.useState(false);
+  // Set by an open project with rows, for the header's search
+  const [projectRowSearch, setProjectRowSearch] = React.useState(null);
   return (
     <OperationsProvider
       value={{
@@ -27,7 +29,9 @@ const LayoutContext = ({ subPages }) => {
         setToggles: setToggles,
         toggles: toggles,
         alert: alert,
-        setAlert: setAlert
+        setAlert: setAlert,
+        projectRowSearch: projectRowSearch,
+        setProjectRowSearch: setProjectRowSearch
       }}>
       {subPages}
     </OperationsProvider>
diff --git a/src/components/app/__tests__/headerSearch.test.js b/src/components/app/__tests__/headerSearch.test.js
new file mode 100644
index 00000000..a0ecdc98
--- /dev/null
+++ b/src/components/app/__tests__/headerSearch.test.js
@@ -0,0 +1,22 @@
+/**
+ * The header search offers the open project's rows and all of OCL
+ * (OpenConceptLab/ocl_online#418).
+ */
+
+import test from 'node:test'
+import assert from 'node:assert/strict'
+
+import { headerSearchOptions, oclSearchURL } from '../headerSearch.js'
+
+test('the header search offers the project rows first, then all of OCL', () => {
+  assert.deepEqual(headerSearchOptions({canSearchRows: true, canSearchOCL: true}), ['rows', 'ocl'])
+  assert.deepEqual(headerSearchOptions({canSearchRows: true, canSearchOCL: false}), ['rows'])
+  assert.deepEqual(headerSearchOptions({canSearchRows: false, canSearchOCL: true}), ['ocl'])
+  assert.deepEqual(headerSearchOptions({canSearchRows: false, canSearchOCL: false}), [])
+})
+
+test('searching all of OCL opens TBv3 concept search', () => {
+  assert.equal(oclSearchURL('https://app.v3.openconceptlab.org', ' malaria fever '), 'https://app.v3.openconceptlab.org/search/?q=malaria%20fever&type=concepts')
+  assert.equal(oclSearchURL('http://localhost:4002', 'a&b'), 'http://localhost:4002/search/?q=a%26b&type=concepts')
+  assert.equal(oclSearchURL('http://localhost:4002', ''), 'http://localhost:4002/search/?type=concepts')
+})
diff --git a/src/components/app/headerSearch.js b/src/components/app/headerSearch.js
new file mode 100644
index 00000000..ab43ff34
--- /dev/null
+++ b/src/components/app/headerSearch.js
@@ -0,0 +1,12 @@
+// The header search's options: the open project's rows, once it has some,
+// and all of OCL, when a TermBrowser is configured.
+export const headerSearchOptions = ({canSearchRows, canSearchOCL}) => [
+  ...(canSearchRows ? ['rows'] : []),
+  ...(canSearchOCL ? ['ocl'] : []),
+]
+
+// TBv3's concept search for the query, as TBv3's own search bar opens it.
+export const oclSearchURL = (termBrowserURL, query) => {
+  const q = (query || '').trim()
+  return `${termBrowserURL}/search/?${q ? `q=${encodeURIComponent(q)}&` : ''}type=concepts`
+}
diff --git a/src/components/map-projects/DataGridControls.jsx b/src/components/map-projects/DataGridControls.jsx
index dbf9ce2e..a1109afa 100644
--- a/src/components/map-projects/DataGridControls.jsx
+++ b/src/components/map-projects/DataGridControls.jsx
@@ -55,7 +55,8 @@ const DataGridControls = ({
   bulkMapType,
   onBulkMapTypeChange,
   allMapTypes,
-  onSearchTextChange
+  onSearchTextChange,
+  searchValue
 }) => {
   const { t } = useTranslation();
   const raisedBulkSelectSx = {
@@ -100,7 +101,7 @@ const DataGridControls = ({
     <>
       <div className='col-xs-12' style={{padding: '12px 14px 8px 14px', display: 'flex', alignItems: 'center', backgroundColor: SURFACE_COLORS.main}}>
         <FormControl sx={{minWidth: '16px'}}>
-          <SearchField onChange={debouncedSearchChange} />
+          <SearchField onChange={debouncedSearchChange} value={searchValue} />
         </FormControl>
         <ScoreBucketButton
           selected={selectedCandidatesScoreBucket}
diff --git a/src/components/map-projects/MapProject.jsx b/src/components/map-projects/MapProject.jsx
index c8087b49..989cc7aa 100644
--- a/src/components/map-projects/MapProject.jsx
+++ b/src/components/map-projects/MapProject.jsx
@@ -156,7 +156,7 @@ const MAPPER_QUOTA_SURFACE = {match_operations: 'auto_match', ai_assistant_calls
 
 const MapProject = () => {
   const { t } = useTranslation();
-  const { toggles, setAlert: baseSetAlert } = React.useContext(OperationsContext);
+  const { toggles, setAlert: baseSetAlert, setProjectRowSearch } = React.useContext(OperationsContext);
   const user = getCurrentUser()
   const [mapperQuotaCacheVersion, setMapperQuotaCacheVersion] = React.useState(0)
   const refreshMapperQuotaCache = React.useCallback(() => {
@@ -303,6 +303,7 @@ const MapProject = () => {
   const [selectedRowStatus, setSelectedRowStatus] = React.useState('all')
   const [decisionTab, setDecisionTab] = React.useState('candidates')
   const [searchText, setSearchText] = React.useState('')  // csv row search
+  const [headerRowSearch, setHeaderRowSearch] = React.useState(null)  // set by the header's search
   const [selectedCandidatesScoreBucket, setSelectedCandidatesScoreBucket] = React.useState(false)
   const [scoreBucketSortBy, setScoreBucketSortBy] = React.useState('desc')
 
@@ -2924,6 +2925,20 @@ const MapProject = () => {
   const isRunningBulkBridgeCandidates = bridgeCandidatesEndedAt ? moment().isBetween(bridgeCandidatesStartedAt, bridgeCandidatesEndedAt) : Boolean(bridgeCandidatesStartedAt)
   const isRunningBulkScispacyCandidates = scispacyCandidatesEndedAt ? moment().isBetween(scispacyCandidatesStartedAt, scispacyCandidatesEndedAt) : Boolean(scispacyCandidatesStartedAt)
 
+  // The header's search can search this project's rows once it has some.
+  const hasRows = Boolean(data?.length)
+  React.useEffect(() => {
+    if(!hasRows)
+      return
+    setProjectRowSearch({
+      search: text => {
+        setSearchText(text)
+        setHeaderRowSearch({text})
+      }
+    })
+    return () => setProjectRowSearch(null)
+  }, [hasRows])
+
   // Leaving while a run is going, or before a new project's first save, asks first.
   const isRunActive = Boolean(loadingMatches || isRunningBulkAnalysis || isRunningBulkBridgeCandidates || isRunningBulkScispacyCandidates)
   isRunActiveRef.current = isRunActive
@@ -6500,6 +6515,7 @@ const MapProject = () => {
                 onBulkMapTypeChange={onBulkMapTypeChange}
                 allMapTypes={allMapTypes}
                 onSearchTextChange={setSearchText}
+                searchValue={headerRowSearch}
               />
               <Snackbar
                 open={Boolean(alert?.message)}
diff --git a/src/components/map-projects/SearchField.jsx b/src/components/map-projects/SearchField.jsx
index f639a230..68a108fa 100644
--- a/src/components/map-projects/SearchField.jsx
+++ b/src/components/map-projects/SearchField.jsx
@@ -5,9 +5,15 @@ import SearchIcon from '@mui/icons-material/Search';
 import ClearIcon from '@mui/icons-material/Clear';
 import { useFormControl } from '@mui/material/FormControl';
 
-const SearchField = ({onChange}) => {
+const SearchField = ({onChange, value}) => {
   const [input, setInput] = React.useState('')
   const { focused } = useFormControl() || {};
+
+  // Text set from outside, such as the header's search: {text}
+  React.useEffect(() => {
+    if(value)
+      setInput(value.text)
+  }, [value])
   const _onChange = event => {
     const value = event.target.value
     setInput(value)
diff --git a/src/i18n/locales/en/translations.json b/src/i18n/locales/en/translations.json
index 1f256647..67e285e7 100644
--- a/src/i18n/locales/en/translations.json
+++ b/src/i18n/locales/en/translations.json
@@ -33,6 +33,9 @@
     "more_actions": "More actions",
     "copied_to_clipboard": "Copied to clipboard",
     "search": "Search",
+    "clear": "Clear",
+    "navigate": "Navigate",
+    "select": "Select",
     "please": "Please",
     "save": "Save",
     "saved": "Saved",
@@ -199,7 +202,12 @@
     "list_view": "List View",
     "table_view": "Table View",
     "select_all_rows": "Select all rows",
-    "input_placeholder": "Search OCL..."
+    "input_placeholder": "Search OCL...",
+    "input_placeholder_drawer": "Enter a search term",
+    "search_project_rows": "Search this project's rows for ",
+    "search_project_rows_hint": "Filter this project",
+    "search_all_site": "Search all of OCL for ",
+    "search_all_concepts": "Search all concepts"
   },
   "url_registry": {
     "global_registry": "Global registry"
diff --git a/src/i18n/locales/es/translations.json b/src/i18n/locales/es/translations.json
index 981f2d41..d90f5185 100644
--- a/src/i18n/locales/es/translations.json
+++ b/src/i18n/locales/es/translations.json
@@ -22,6 +22,9 @@
     "more_actions": "Más acciones",
     "copied_to_clipboard": "Copiado al portapapeles",
     "search": "Buscar",
+    "clear": "Borrar",
+    "navigate": "Navegar",
+    "select": "Seleccionar",
     "save": "Guardar",
     "saved": "Guardado",
     "delete": "Eliminar",
@@ -190,7 +193,12 @@
     "list_view": "Vista de lista",
     "table_view": "Vista de tabla",
     "select_all_rows": "Seleccionar todas las filas",
-    "input_placeholder": "Buscar en OCL..."
+    "input_placeholder": "Buscar en OCL...",
+    "input_placeholder_drawer": "Ingresa un término de búsqueda",
+    "search_project_rows": "Buscar en las filas de este proyecto para ",
+    "search_project_rows_hint": "Filtrar este proyecto",
+    "search_all_site": "Buscar en todo OCL para ",
+    "search_all_concepts": "Buscar todos los conceptos"
   },
   "locale": {
     "add_custom_language_codes": "Agregar código(s) de idioma personalizado(s)",
diff --git a/src/i18n/locales/pt-BR/translations.json b/src/i18n/locales/pt-BR/translations.json
index c8963fd0..16d561ca 100644
--- a/src/i18n/locales/pt-BR/translations.json
+++ b/src/i18n/locales/pt-BR/translations.json
@@ -33,6 +33,9 @@
     "more_actions": "Mais ações",
     "copied_to_clipboard": "Copiado para a área de transferência",
     "search": "Buscar",
+    "clear": "Limpar",
+    "navigate": "Navegar",
+    "select": "Selecionar",
     "please": "Por favor,",
     "save": "Salvar",
     "saved": "Salvo",
@@ -199,7 +202,12 @@
     "list_view": "Visualização em Lista",
     "table_view": "Visualização em Tabela",
     "select_all_rows": "Selecionar todas as linhas",
-    "input_placeholder": "Buscar no OCL..."
+    "input_placeholder": "Buscar no OCL...",
+    "input_placeholder_drawer": "Digite um termo de busca",
+    "search_project_rows": "Buscar nas linhas deste projeto por ",
+    "search_project_rows_hint": "Filtrar este projeto",
+    "search_all_site": "Buscar em todo o OCL por ",
+    "search_all_concepts": "Buscar todos os conceitos"
   },
   "url_registry": {
     "global_registry": "Registro Global"
diff --git a/src/i18n/locales/zh/translations.json b/src/i18n/locales/zh/translations.json
index c24c12b4..308762ff 100644
--- a/src/i18n/locales/zh/translations.json
+++ b/src/i18n/locales/zh/translations.json
@@ -32,6 +32,9 @@
     "more_actions": "更多操作",
     "copied_to_clipboard": "已复制到粘贴板",
     "search": "搜索",
+    "clear": "清除",
+    "navigate": "导航",
+    "select": "选择",
     "please": "请",
     "save": "保存",
     "saved": "已保存",
@@ -199,7 +202,12 @@
     "list_view": "列表视图",
     "table_view": "表格视图",
     "select_all_rows": "选择全部行",
-    "input_placeholder": "搜索 OCL..."
+    "input_placeholder": "搜索 OCL...",
+    "input_placeholder_drawer": "输入搜索词",
+    "search_project_rows": "在此项目的行中搜索 ",
+    "search_project_rows_hint": "筛选此项目",
+    "search_all_site": "在整个 OCL 中搜索 ",
+    "search_all_concepts": "搜索所有概念"
   },
   "url_registry": {
     "global_registry": "全球注册库"

From 95852a062fba7867d87d53df4fd97f41bf15f7cc Mon Sep 17 00:00:00 2001
From: Jonathan Payne <paynejd@gmail.com>
Date: Fri, 30 Oct 2026 11:02:32 -0400
Subject: [PATCH 10/14] OpenConceptLab/ocl_online#418 | Header search helpers
 get a name apart from the component

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 src/components/app/HeaderSearch.jsx                             | 2 +-
 .../{headerSearch.test.js => headerSearchOptions.test.js}       | 2 +-
 src/components/app/{headerSearch.js => headerSearchOptions.js}  | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename src/components/app/__tests__/{headerSearch.test.js => headerSearchOptions.test.js} (98%)
 rename src/components/app/{headerSearch.js => headerSearchOptions.js} (100%)

diff --git a/src/components/app/HeaderSearch.jsx b/src/components/app/HeaderSearch.jsx
index ca49e340..2cfa60e1 100644
--- a/src/components/app/HeaderSearch.jsx
+++ b/src/components/app/HeaderSearch.jsx
@@ -16,7 +16,7 @@ import UpIcon from '@mui/icons-material/ArrowUpward'
 import DownIcon from '@mui/icons-material/ArrowDownward'
 import { getV3URL, hasTermBrowser } from '../../common/utils'
 import { OperationsContext } from './LayoutContext'
-import { headerSearchOptions, oclSearchURL } from './headerSearch'
+import { headerSearchOptions, oclSearchURL } from './headerSearchOptions'
 
 // Ported from TBv3's SearchInput and SearchInputDrawer, so search looks and
 // behaves the same in both apps. A magnifier opens the drawer, which searches
diff --git a/src/components/app/__tests__/headerSearch.test.js b/src/components/app/__tests__/headerSearchOptions.test.js
similarity index 98%
rename from src/components/app/__tests__/headerSearch.test.js
rename to src/components/app/__tests__/headerSearchOptions.test.js
index a0ecdc98..f065b7ea 100644
--- a/src/components/app/__tests__/headerSearch.test.js
+++ b/src/components/app/__tests__/headerSearchOptions.test.js
@@ -6,7 +6,7 @@
 import test from 'node:test'
 import assert from 'node:assert/strict'
 
-import { headerSearchOptions, oclSearchURL } from '../headerSearch.js'
+import { headerSearchOptions, oclSearchURL } from '../headerSearchOptions.js'
 
 test('the header search offers the project rows first, then all of OCL', () => {
   assert.deepEqual(headerSearchOptions({canSearchRows: true, canSearchOCL: true}), ['rows', 'ocl'])
diff --git a/src/components/app/headerSearch.js b/src/components/app/headerSearchOptions.js
similarity index 100%
rename from src/components/app/headerSearch.js
rename to src/components/app/headerSearchOptions.js

From 14d0134510d4fc440a5e7acbdb636650b81a5fd9 Mon Sep 17 00:00:00 2001
From: Jonathan Payne <paynejd@gmail.com>
Date: Fri, 30 Oct 2026 13:21:05 -0400
Subject: [PATCH 11/14] OpenConceptLab/ocl_online#418 | A failed save keeps the
 leave warning; a refused new project keeps its explanation; a standalone
 Mapper keeps its own pages

- Leaving after a save failed warns until a save succeeds, as the removed
  decisions-based warning did.
- The project list no longer redirects to TBv3 while it shows why a new
  project was refused.
- localhost counts as connected to a TermBrowser only when TERMBROWSER_URL
  is set, and docker-compose no longer defaults it to localhost:4002.
- The community-site link constant moves below PRIVACY_POLICY_URL, away from
  the lines the banner PR (oclmap#121) removes.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 docker-compose.yml                                       | 2 +-
 src/common/__tests__/appUrls.test.js                     | 5 +++--
 src/common/appUrls.js                                    | 9 +++++----
 src/common/constants.js                                  | 2 +-
 src/components/map-projects/MapProject.jsx               | 8 +++++++-
 src/components/map-projects/MapProjectsRedirect.jsx      | 4 +++-
 src/components/map-projects/__tests__/leaveGuard.test.js | 1 +
 src/components/map-projects/leaveGuard.js                | 6 +++---
 8 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 1d7215af..a6d01a7f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -23,5 +23,5 @@ services:
       - AI_ASSISTANT_API_URL
       - SCISPACY_LOINC_API_URL
       - OCL_ONLINE_API_URL
-      - TERMBROWSER_URL=${TERMBROWSER_URL-http://localhost:4002}
+      - TERMBROWSER_URL=${TERMBROWSER_URL-}
       - REPO_SUGGESTIONS=${REPO_SUGGESTIONS}
diff --git a/src/common/__tests__/appUrls.test.js b/src/common/__tests__/appUrls.test.js
index 7ed6353f..ac921a00 100644
--- a/src/common/__tests__/appUrls.test.js
+++ b/src/common/__tests__/appUrls.test.js
@@ -22,9 +22,10 @@ test('custom hosts without configuration point to production', () => {
   assert.equal(resolveV3URL('', undefined, undefined), PRODUCTION_TERMBROWSER_URL)
 })
 
-test('an integrated TermBrowser needs configuration, localhost or an official Mapper host', () => {
+test('an integrated TermBrowser needs configuration or an official Mapper host', () => {
   assert.equal(resolveIntegratedV3URL('https://tb.example.org/', 'https://mapper.example.org', 'mapper.example.org'), 'https://tb.example.org')
-  assert.equal(resolveIntegratedV3URL('', 'http://localhost:4004', 'localhost:4004'), 'http://localhost:4002')
+  assert.equal(resolveIntegratedV3URL('http://localhost:4002', 'http://localhost:4004', 'localhost:4004'), 'http://localhost:4002')
+  assert.equal(resolveIntegratedV3URL('', 'http://localhost:4004', 'localhost:4004'), '', 'a standalone local Mapper keeps its own pages')
   assert.equal(resolveIntegratedV3URL('', 'https://map.qa.openconceptlab.org', 'map.qa.openconceptlab.org'), 'https://app.v3.qa.openconceptlab.org')
   assert.equal(resolveIntegratedV3URL('', 'https://mapper.example.org', 'mapper.example.org'), '')
   assert.equal(resolveIntegratedV3URL('', undefined, undefined), '')
diff --git a/src/common/appUrls.js b/src/common/appUrls.js
index d3add84f..073cfeef 100644
--- a/src/common/appUrls.js
+++ b/src/common/appUrls.js
@@ -2,15 +2,16 @@ export const PRODUCTION_TERMBROWSER_URL = 'https://app.v3.openconceptlab.org'
 
 const OFFICIAL_MAPPER_ORIGIN = /^https:\/\/map\.([a-z]+\.)*openconceptlab\.org$/
 
-export const resolveIntegratedV3URL = (configured, origin, host) => {
+// A TermBrowser counts as part of this installation only when it's configured
+// or this is an official Mapper host; a standalone Mapper keeps its own pages.
+export const resolveIntegratedV3URL = (configured, origin) => {
   const url = (configured || '').trim().replace(/\/+$/, '')
   if(url)
     return url
-  if(host?.includes('localhost'))
-    return 'http://localhost:4002'
   if(OFFICIAL_MAPPER_ORIGIN.test(origin || ''))
     return origin.replace('//map.', '//app.v3.')
   return ''
 }
 
-export const resolveV3URL = (configured, origin, host) => resolveIntegratedV3URL(configured, origin, host) || PRODUCTION_TERMBROWSER_URL
+export const resolveV3URL = (configured, origin, host) =>
+  resolveIntegratedV3URL(configured, origin) || (host?.includes('localhost') ? 'http://localhost:4002' : PRODUCTION_TERMBROWSER_URL)
diff --git a/src/common/constants.js b/src/common/constants.js
index b97fd17a..b364d120 100644
--- a/src/common/constants.js
+++ b/src/common/constants.js
@@ -76,6 +76,6 @@ export const MATCHING_ALGORITHMS_DOC_LINK = 'https://docs.openconceptlab.org/en/
 export const MAPPER_DOCS_LINK = 'https://docs.openconceptlab.org/en/latest/oclmap/overview.html'
 export const MAPPER_ANNOUNCEMENT_LETTER_URL = 'https://openconceptlab.org/blog/letter-to-the-ocl-community?utm_source=oclmap&utm_medium=banner&utm_campaign=subscription_dates'
 export const MAPPER_ANNOUNCEMENT_PRICING_URL = 'https://openconceptlab.org/pricing?utm_source=oclmap&utm_medium=banner&utm_campaign=subscription_dates'
-export const COMMUNITY_SITE_URL = 'https://openconceptlab.org'
 export const TERMS_OF_USE_URL = 'https://openconceptlab.org/terms-of-use'
 export const PRIVACY_POLICY_URL = 'https://openconceptlab.org/privacy-policy'
+export const COMMUNITY_SITE_URL = 'https://openconceptlab.org'
diff --git a/src/components/map-projects/MapProject.jsx b/src/components/map-projects/MapProject.jsx
index 989cc7aa..89cd4e71 100644
--- a/src/components/map-projects/MapProject.jsx
+++ b/src/components/map-projects/MapProject.jsx
@@ -335,6 +335,8 @@ const MapProject = () => {
   const inFlightSaveRef = React.useRef(null)
   const isMountedRef = React.useRef(true)
   const autosaveSchedulerRef = React.useRef(null)
+  // Set when a save fails, cleared when one succeeds: the change is still unsaved.
+  const lastSaveFailedRef = React.useRef(false)
   if(!autosaveSchedulerRef.current)
     autosaveSchedulerRef.current = createAutosaveScheduler({
       getProjectId: () => projectIdRef.current,
@@ -428,6 +430,7 @@ const MapProject = () => {
       const warn = shouldWarnBeforeUnload({
         pendingAutosave: autosaveSchedulerRef.current.hasPending(),
         saveInFlight: inFlightSaveRef.current,
+        saveFailed: lastSaveFailedRef.current,
         runActive: isRunActiveRef.current,
         projectId: projectIdRef.current,
         hasInput: hasInputRef.current,
@@ -1819,8 +1822,11 @@ const MapProject = () => {
           baseSetAlert({severity: 'success', message: t('map_project.successfully_saved'), duration: 2000})
 
         postProjectLogs(response.data.url, {row_logs: savedRowLogs, project_logs: savedProjectLogs})
+        lastSaveFailedRef.current = false
         return true
-      } else if(options.leaving && status !== 401) {
+      }
+      lastSaveFailedRef.current = true
+      if(options.leaving && status !== 401) {
         // The user has left the project, so no dialog can show: say so once.
         baseSetAlert({severity: 'error', message: t('map_project.leave_save_failed', {name: name || project?.name, detail: errorData?.detail || t('unknown_error')}), duration: 12000})
       } else if(status === 403 && errorData?.error_code) {
diff --git a/src/components/map-projects/MapProjectsRedirect.jsx b/src/components/map-projects/MapProjectsRedirect.jsx
index 13d700bc..bce95f65 100644
--- a/src/components/map-projects/MapProjectsRedirect.jsx
+++ b/src/components/map-projects/MapProjectsRedirect.jsx
@@ -4,7 +4,9 @@ import MapProjects from './MapProjects';
 
 const MapProjectsRedirect = props => {
   const user = getCurrentUser()
-  const blockedNewProject = Boolean(props.location?.state?.newProjectBlock)
+  // A refused new project lands here with its reason in location.state. MapProjects
+  // shows that reason and clears the state, so the choice to stay is kept for this visit.
+  const [blockedNewProject] = React.useState(() => Boolean(props.location?.state?.newProjectBlock))
   const redirect = Boolean(user?.url) && !blockedNewProject && hasTermBrowser()
 
   React.useEffect(() => {
diff --git a/src/components/map-projects/__tests__/leaveGuard.test.js b/src/components/map-projects/__tests__/leaveGuard.test.js
index 548a62f0..3e4ea861 100644
--- a/src/components/map-projects/__tests__/leaveGuard.test.js
+++ b/src/components/map-projects/__tests__/leaveGuard.test.js
@@ -213,4 +213,5 @@ test('closing the tab also warns while a change waits to be saved', () => {
   assert.equal(shouldWarnBeforeUnload({...saved, pendingAutosave: true, saveInFlight: false}), true)
   assert.equal(shouldWarnBeforeUnload({...saved, pendingAutosave: false, saveInFlight: true}), true)
   assert.equal(shouldWarnBeforeUnload({pendingAutosave: false, saveInFlight: false, runActive: false, projectId: null, hasInput: true}), true)
+  assert.equal(shouldWarnBeforeUnload({...saved, pendingAutosave: false, saveInFlight: false, saveFailed: true}), true, 'a failed save still has a change to lose')
 })
diff --git a/src/components/map-projects/leaveGuard.js b/src/components/map-projects/leaveGuard.js
index ccbf5122..618467e3 100644
--- a/src/components/map-projects/leaveGuard.js
+++ b/src/components/map-projects/leaveGuard.js
@@ -10,9 +10,9 @@ export const shouldAskBeforeLeaving = ({runActive, projectId, hasInput}) =>
   Boolean(runActive) || isUnsavedNewProject({projectId, hasInput})
 
 // Closing the tab or opening another site gets no unmount save: ask while a
-// change waits for autosave or a save is in flight too.
-export const shouldWarnBeforeUnload = ({pendingAutosave, saveInFlight, runActive, projectId, hasInput}) =>
-  Boolean(pendingAutosave || saveInFlight) || shouldAskBeforeLeaving({runActive, projectId, hasInput})
+// change waits for autosave, a save is in flight, or the last save failed.
+export const shouldWarnBeforeUnload = ({pendingAutosave, saveInFlight, saveFailed, runActive, projectId, hasInput}) =>
+  Boolean(pendingAutosave || saveInFlight || saveFailed) || shouldAskBeforeLeaving({runActive, projectId, hasInput})
 
 // Holds in-app navigation, unless isAllowed, and hands it to onBlocked as
 // {location, action}. Returns the unblock function.

From 42acd47832ee0e70cb8d81adbe0a9583ecb5299d Mon Sep 17 00:00:00 2001
From: Jonathan Payne <paynejd@gmail.com>
Date: Fri, 30 Oct 2026 13:27:38 -0400
Subject: [PATCH 12/14] OpenConceptLab/ocl_online#418 | Mapping or unmapping a
 candidate and editing a review note autosave, like other decisions

Without the removed decisions-based leave warning, these edits had nothing
protecting them: they scheduled no autosave, so leaving dropped them silently.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 src/components/map-projects/MapProject.jsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/components/map-projects/MapProject.jsx b/src/components/map-projects/MapProject.jsx
index 89cd4e71..908e5c94 100644
--- a/src/components/map-projects/MapProject.jsx
+++ b/src/components/map-projects/MapProject.jsx
@@ -3640,6 +3640,7 @@ const MapProject = () => {
         setShowItem(false)
       return prev
     })
+    scheduleAutoSave('decision_change')
     return false
   }
 
@@ -6797,7 +6798,10 @@ const MapProject = () => {
                 <Divider sx={{width: '100%'}} />
                 <ReviewNote
                   value={notes[rowIndex]}
-                  onChange={event => setNotes({...notes, [rowIndex]: event.target.value || ''})}
+                  onChange={event => {
+                    setNotes({...notes, [rowIndex]: event.target.value || ''})
+                    scheduleAutoSave('note_change')
+                  }}
                 />
                 <div className='col-xs-12' style={{padding: '0 0 8px 78px'}}>
                   <Button size='small' disabled={rowStatuses.reviewed.includes(rowIndex) || decisions[rowIndex] === 'none' || !decisions[rowIndex]} color='primary' onClick={() => onReviewDone(true)} variant='contained' sx={{textTransform: 'none'}}>

From 1b1a1fd09359ecb8a8ff300f2309edd4c2b57367 Mon Sep 17 00:00:00 2001
From: Jonathan Payne <paynejd@gmail.com>
Date: Fri, 30 Oct 2026 13:28:28 -0400
Subject: [PATCH 13/14] OpenConceptLab/ocl_online#418 | Simplification review:
 drop an unused search placeholder string; Stop and leave reuses leaveTo

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 src/components/map-projects/MapProject.jsx | 5 +----
 src/i18n/locales/en/translations.json      | 1 -
 src/i18n/locales/es/translations.json      | 1 -
 src/i18n/locales/pt-BR/translations.json   | 1 -
 src/i18n/locales/zh/translations.json      | 1 -
 5 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/components/map-projects/MapProject.jsx b/src/components/map-projects/MapProject.jsx
index 908e5c94..00560e9f 100644
--- a/src/components/map-projects/MapProject.jsx
+++ b/src/components/map-projects/MapProject.jsx
@@ -2971,10 +2971,7 @@ const MapProject = () => {
     setLeaveTarget(null)
     stopRunOnLeave()
     saveNowOnLeave()
-    unblockLeavingRef.current?.()
-    unblockLeavingRef.current = null
-    if(target)
-      continueLeaving(history, target)
+    leaveTo(target)
   }
 
   const leaveTo = target => {
diff --git a/src/i18n/locales/en/translations.json b/src/i18n/locales/en/translations.json
index 67e285e7..d79cc41f 100644
--- a/src/i18n/locales/en/translations.json
+++ b/src/i18n/locales/en/translations.json
@@ -202,7 +202,6 @@
     "list_view": "List View",
     "table_view": "Table View",
     "select_all_rows": "Select all rows",
-    "input_placeholder": "Search OCL...",
     "input_placeholder_drawer": "Enter a search term",
     "search_project_rows": "Search this project's rows for ",
     "search_project_rows_hint": "Filter this project",
diff --git a/src/i18n/locales/es/translations.json b/src/i18n/locales/es/translations.json
index d90f5185..d2cedf8f 100644
--- a/src/i18n/locales/es/translations.json
+++ b/src/i18n/locales/es/translations.json
@@ -193,7 +193,6 @@
     "list_view": "Vista de lista",
     "table_view": "Vista de tabla",
     "select_all_rows": "Seleccionar todas las filas",
-    "input_placeholder": "Buscar en OCL...",
     "input_placeholder_drawer": "Ingresa un término de búsqueda",
     "search_project_rows": "Buscar en las filas de este proyecto para ",
     "search_project_rows_hint": "Filtrar este proyecto",
diff --git a/src/i18n/locales/pt-BR/translations.json b/src/i18n/locales/pt-BR/translations.json
index 16d561ca..c378c1a2 100644
--- a/src/i18n/locales/pt-BR/translations.json
+++ b/src/i18n/locales/pt-BR/translations.json
@@ -202,7 +202,6 @@
     "list_view": "Visualização em Lista",
     "table_view": "Visualização em Tabela",
     "select_all_rows": "Selecionar todas as linhas",
-    "input_placeholder": "Buscar no OCL...",
     "input_placeholder_drawer": "Digite um termo de busca",
     "search_project_rows": "Buscar nas linhas deste projeto por ",
     "search_project_rows_hint": "Filtrar este projeto",
diff --git a/src/i18n/locales/zh/translations.json b/src/i18n/locales/zh/translations.json
index 308762ff..39ec6946 100644
--- a/src/i18n/locales/zh/translations.json
+++ b/src/i18n/locales/zh/translations.json
@@ -202,7 +202,6 @@
     "list_view": "列表视图",
     "table_view": "表格视图",
     "select_all_rows": "选择全部行",
-    "input_placeholder": "搜索 OCL...",
     "input_placeholder_drawer": "输入搜索词",
     "search_project_rows": "在此项目的行中搜索 ",
     "search_project_rows_hint": "筛选此项目",

From ee7752144a5aeb484a21f4bc6e6744802cd9cf4e Mon Sep 17 00:00:00 2001
From: Jonathan Payne <paynejd@gmail.com>
Date: Fri, 30 Oct 2026 13:34:52 -0400
Subject: [PATCH 14/14] OpenConceptLab/ocl_online#418 | Leaving with Configure
 open and changed warns, and an in-app leave saves those changes

Configure's edits save when it closes. Without the removed decisions-based
warning, closing the tab or following a cross-app link with Configure still
open dropped them silently.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 src/components/map-projects/MapProject.jsx           | 12 ++++++++++++
 .../map-projects/__tests__/leaveGuard.test.js        |  1 +
 src/components/map-projects/leaveGuard.js            |  7 ++++---
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/components/map-projects/MapProject.jsx b/src/components/map-projects/MapProject.jsx
index 00560e9f..3f92f9c4 100644
--- a/src/components/map-projects/MapProject.jsx
+++ b/src/components/map-projects/MapProject.jsx
@@ -325,6 +325,7 @@ const MapProject = () => {
   const projectLogsLoadedRef = React.useRef(!params.projectId)
   const autoMatchAIDefaultAppliedRef = React.useRef(false)
   const configSnapshotOnOpenRef = React.useRef(null)
+  const getConfigurationSnapshotRef = React.useRef(null)
   const projectIdRef = React.useRef(null)
   const onSaveRef = React.useRef(null)
   const projectLogRef = React.useRef(() => {})
@@ -388,8 +389,16 @@ const MapProject = () => {
   React.useEffect(() => {
     onSaveRef.current = onSave
     projectLogRef.current = projectLog
+    getConfigurationSnapshotRef.current = getConfigurationSnapshot
   })
 
+  // Configure's edits save when it closes, so leaving with it open and changed
+  // would drop them.
+  const hasUnsavedConfiguration = () => {
+    const opened = configSnapshotOnOpenRef.current
+    return Boolean(opened && getConfigurationSnapshotRef.current) && opened !== getConfigurationSnapshotRef.current()
+  }
+
   // Leaving the project unmounts this page, often inside the autosave window:
   // save the pending change now rather than drop it
   // (OpenConceptLab/ocl_issues#2829). Nothing to save once signed out.
@@ -417,6 +426,8 @@ const MapProject = () => {
     return () => {
       isMountedRef.current = false
       stopRunOnLeave()
+      if(hasUnsavedConfiguration())
+        autosaveSchedulerRef.current.schedule('configuration_change')
       saveNowOnLeave()
     }
   }, [])
@@ -431,6 +442,7 @@ const MapProject = () => {
         pendingAutosave: autosaveSchedulerRef.current.hasPending(),
         saveInFlight: inFlightSaveRef.current,
         saveFailed: lastSaveFailedRef.current,
+        configChanged: hasUnsavedConfiguration(),
         runActive: isRunActiveRef.current,
         projectId: projectIdRef.current,
         hasInput: hasInputRef.current,
diff --git a/src/components/map-projects/__tests__/leaveGuard.test.js b/src/components/map-projects/__tests__/leaveGuard.test.js
index 3e4ea861..5e3957a9 100644
--- a/src/components/map-projects/__tests__/leaveGuard.test.js
+++ b/src/components/map-projects/__tests__/leaveGuard.test.js
@@ -214,4 +214,5 @@ test('closing the tab also warns while a change waits to be saved', () => {
   assert.equal(shouldWarnBeforeUnload({...saved, pendingAutosave: false, saveInFlight: true}), true)
   assert.equal(shouldWarnBeforeUnload({pendingAutosave: false, saveInFlight: false, runActive: false, projectId: null, hasInput: true}), true)
   assert.equal(shouldWarnBeforeUnload({...saved, pendingAutosave: false, saveInFlight: false, saveFailed: true}), true, 'a failed save still has a change to lose')
+  assert.equal(shouldWarnBeforeUnload({...saved, pendingAutosave: false, saveInFlight: false, configChanged: true}), true, 'Configure open with changes has them to lose')
 })
diff --git a/src/components/map-projects/leaveGuard.js b/src/components/map-projects/leaveGuard.js
index 618467e3..05fe2d1b 100644
--- a/src/components/map-projects/leaveGuard.js
+++ b/src/components/map-projects/leaveGuard.js
@@ -10,9 +10,10 @@ export const shouldAskBeforeLeaving = ({runActive, projectId, hasInput}) =>
   Boolean(runActive) || isUnsavedNewProject({projectId, hasInput})
 
 // Closing the tab or opening another site gets no unmount save: ask while a
-// change waits for autosave, a save is in flight, or the last save failed.
-export const shouldWarnBeforeUnload = ({pendingAutosave, saveInFlight, saveFailed, runActive, projectId, hasInput}) =>
-  Boolean(pendingAutosave || saveInFlight || saveFailed) || shouldAskBeforeLeaving({runActive, projectId, hasInput})
+// change waits for autosave, a save is in flight, the last save failed, or
+// Configure is open with changes.
+export const shouldWarnBeforeUnload = ({pendingAutosave, saveInFlight, saveFailed, configChanged, runActive, projectId, hasInput}) =>
+  Boolean(pendingAutosave || saveInFlight || saveFailed || configChanged) || shouldAskBeforeLeaving({runActive, projectId, hasInput})
 
 // Holds in-app navigation, unless isAllowed, and hands it to onBlocked as
 // {location, action}. Returns the unblock function.