Skip to content

Commit ee49174

Browse files
committed
OpenConceptLab/ocl_issues#2183 | concept dialog to have map/un-map button and repo breadcrumbs
1 parent 8629d3b commit ee49174

3 files changed

Lines changed: 31 additions & 12 deletions

File tree

src/components/concepts/ConceptHeader.jsx

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@ import { toOwnerURI, currentUserHasAccess } from '../../common/utils';
1010
import Breadcrumbs from '../common/Breadcrumbs'
1111
import { BLACK } from '../../common/colors'
1212
import ConceptManagementList from './ConceptManagementList'
13+
import MapButton from '../map-projects/MapButton'
1314

14-
const ConceptHeader = ({concept, repo, onClose, repoURL, onEdit, nested, loading}) => {
15+
const ConceptHeader = ({concept, repo, onClose, repoURL, onEdit, nested, loading, onMap, isSelectedForMap}) => {
1516
const { t } = useTranslation()
1617
const [menu, setMenu] = React.useState(false)
1718
const [menuAnchorEl, setMenuAnchorEl] = React.useState(false)
@@ -60,9 +61,20 @@ const ConceptHeader = ({concept, repo, onClose, repoURL, onEdit, nested, loading
6061
{
6162
!concept?.id ?
6263
<Skeleton variant='text' sx={{fontSize: '22px', width: '150px'}} />:
64+
<span style={{display: 'flex', justifyContent: 'space-between', alignItems: 'center'}}>
6365
<Typography sx={{fontSize: '22px', color: BLACK}} className='searchable'>
6466
{concept.display_name}
6567
</Typography>
68+
{
69+
onMap &&
70+
<MapButton
71+
simple
72+
onClick={(event, applied, mapType) => onMap(event, concept, !applied, mapType)}
73+
isMapped={isSelectedForMap(concept)}
74+
sx={{marginLeft: '8px'}}
75+
/>
76+
}
77+
</span>
6678
}
6779
</div>
6880
{

src/components/concepts/ConceptHome.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ const ConceptHome = props => {
171171
!edit &&
172172
<>
173173
<div className='col-xs-12 padding-0'>
174-
<ConceptHeader concept={concept} onClose={props.onClose} repoURL={getRepoURL()} onEdit={onEdit} repo={repo} nested={props.nested} loading={loading} />
174+
<ConceptHeader concept={concept} onClose={props.onClose} repoURL={getRepoURL()} onEdit={onEdit} repo={repo} nested={props.nested} loading={loading} onMap={props.onMap} isSelectedForMap={props.isSelectedForMap} />
175175
</div>
176176
<ConceptTabs tab={tab} onTabChange={(event, newTab) => setTab(newTab)} loading={loading} />
177177
{

src/components/map-projects/MapProject.jsx

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1422,14 +1422,14 @@ const MapProject = () => {
14221422
>
14231423
{
14241424
ALGOS.map(_algo => (
1425-
<MenuItem
1426-
key={_algo.id}
1427-
disabled={_algo.disabled}
1428-
selected={_algo.id === algo}
1429-
onClick={() => onAlgoSelect(_algo.id)}
1430-
>
1431-
{_algo.label}
1432-
</MenuItem>
1425+
<MenuItem
1426+
key={_algo.id}
1427+
disabled={_algo.disabled}
1428+
selected={_algo.id === algo}
1429+
onClick={() => onAlgoSelect(_algo.id)}
1430+
>
1431+
{_algo.label}
1432+
</MenuItem>
14331433
))
14341434
}
14351435
</Menu>
@@ -1456,11 +1456,18 @@ const MapProject = () => {
14561456
<ConceptHome
14571457
style={{borderRadius: 0}}
14581458
detailsStyle={{height: 'calc(100vh - 550px)'}}
1459-
source={repo} repo={repo} url={showItem.url} concept={showItem} onClose={() => setShowItem(false)} nested />
1459+
source={repo}
1460+
repo={repoVersion}
1461+
url={showItem.url}
1462+
concept={showItem}
1463+
onClose={() => setShowItem(false)}
1464+
onMap={onMap}
1465+
isSelectedForMap={isSelectedForMap}
1466+
/>
14601467
</Dialog>
14611468
}
14621469
</div>
1463-
)
1470+
)
14641471
}
14651472

14661473
export default MapProject;

0 commit comments

Comments
 (0)