Skip to content

OpenConceptLab/ocl_issues#2869 | TBv2's apps menu links to the OCL Mapper #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
snyaggarwal merged 6 commits into from
Oct 5, 2026
Merged

OpenConceptLab/ocl_issues#2869 | TBv2's apps menu links to the OCL Mapper #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
68fe6dc
closes OpenConceptLab/ocl_issues#2869 | TBv2's apps menu links to the…
paynejd Oct 1, 2026
4bf01e1
OpenConceptLab/ocl_issues#2869 | Demo's Mapper link goes to map.qa, a…
paynejd Oct 1, 2026
c052580
OpenConceptLab/ocl_issues#2869 | Signed-in users reach the Mapper sig…
paynejd Oct 1, 2026
4d6dc68
OpenConceptLab/ocl_issues#2869 | toMapperURL() matches only real *.op…
paynejd Oct 1, 2026
669a647
OpenConceptLab/ocl_issues#2869 | toMapperURL() compares hostnames, so…
paynejd Oct 1, 2026
fbb3d3b
OpenConceptLab/ocl_issues#2869 | Restore toMapperURL()'s host routing…
paynejd Oct 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/common/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1188,7 +1188,8 @@ export const toMapperURL = path => {
if(window.location.host.match('app.*.openconceptlab.org'))
url = window.location.origin.replace('//app.', '//map.')

let referrerParams = `referrer=${window.location.href}`
// The Mapper reads auth only from the segment after the first '?' in the referrer's hash, so drop this page's own query
let referrerParams = `referrer=${window.location.href.split('?')[0]}`
if(isLoggedIn())
referrerParams += '?auth=true'

Expand Down
13 changes: 11 additions & 2 deletions src/components/common/AppsMenu.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@ import React from 'react';
import { Link } from 'react-router-dom';
import { useLocation } from 'react-router';
import { Apps as AppsIcon , Web as MetadataBrowserIcon, Publish as ImportsIcon } from '@mui/icons-material';
import MapperIcon from '@mui/icons-material/MotionPhotosAutoOutlined';
import { Tooltip, IconButton, Box, Typography } from '@mui/material';
import useToggle from '../../hooks/useToggle';
import { getSiteTitle } from '../../common/utils';
import { getSiteTitle, toMapperURL } from '../../common/utils';
import PopperGrow from './PopperGrow';

const SITE_TITLE = getSiteTitle()
Expand Down Expand Up @@ -35,7 +36,7 @@ const AppsMenu = props => {
<AppsIcon/>
</IconButton>
</Tooltip>
<PopperGrow open={open.value} anchorRef={anchorRef} handleClose={handleClose}>
<PopperGrow open={open.value} anchorRef={anchorRef} handleClose={handleClose} minWidth='min(390px, 100vw - 16px)'>
<div className='app-menu'>
<Box className="app-container" display="inline-block" justifyContent="space-around" style={{width: '100%'}}>
{
Expand All @@ -60,6 +61,14 @@ const AppsMenu = props => {
</Box>
</Link>
}
<a href={toMapperURL()} target='_blank' rel='noopener noreferrer' className='no-anchor-styles' onClick={handleClose}>
<Box className="app" display="inline-block">
<MapperIcon fontSize="large"/>
<Typography style={{lineHeight:"1.2", marginTop:"15px"}} align="center" component="h6">
OCL <br/> Mapper
</Typography>
</Box>
</a>
</Box>
</div>
</PopperGrow>
Expand Down
Loading